[Gzz-commits] libvob/vob/buoy buoymanager.py

[Matti Katila]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/12 04:59:57

Modified files:
        vob/buoy       : buoymanager.py 

Log message:
        event fixes - still doesn't work correctly

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text

Patches:
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.50 libvob/vob/buoy/buoymanager.py:1.51
--- libvob/vob/buoy/buoymanager.py:1.50 Tue Aug 12 04:13:08 2003
+++ libvob/vob/buoy/buoymanager.py      Tue Aug 12 04:59:57 2003
@@ -228,6 +228,7 @@
                    geometer, buoyGeometryConfiguration = 
DummyGeometryConfiguration()):
        self.singles = [
            SingleFocusManager(i, connectors, buoyGeometryConfiguration) for i 
in mainNodes]
+        self.buoyGeometryConfiguration = buoyGeometryConfiguration
         self.connectors = connectors
        self.eventHandler = eventHandler
        self.geometer = geometer
@@ -241,7 +242,7 @@
     def key(self, key):
         raise 'no key events here, thank you'
     def replaceManager(self, index, replace):
-        self.singles[index] = SingleFocusManager(replace, self.connectors)
+        self.singles[index] = SingleFocusManager(replace, self.connectors, 
self.buoyGeometryConfiguration)
     def getVs(self):
         return self.vs;
     def getSingles(self):
@@ -287,7 +288,7 @@
                 self.replaceScene = self.vs
                 vob.AbstractUpdateManager.setNoAnimation()
             vob.AbstractUpdateManager.chg()
-            return
+            return 1
 
        x, y = ev.getX(), ev.getY()
        cs = self.vs.getCSAt(0, x, y, None)
@@ -297,13 +298,13 @@
                 # pa("IN CS: ",cs, link)
                 self.buoyHit.set(single, link)
                 if self.eventHandler.buoyMouse(self, ev, single, link):
-                    return
+                    return 1
                 
                if ev.getType() != ev.MOUSE_CLICKED:
-                   return
+                   return 0
                single.followLink(link)
                vob.AbstractUpdateManager.chg()
-               return
+               return 1
 
        # Fall through if no link - need main node
        for i in range(0, len(self.singles)):
@@ -313,7 +314,8 @@
                    self.replaceScene = self.vs
                    vob.AbstractUpdateManager.setNoAnimation()
                vob.AbstractUpdateManager.chg()
-               return
+               return 1
+        return 0
 
 vob.impl.gl.GLScreen.dbg = 0