[Gzz-commits] fenfire/org/fenfire/demo buoyoing.py

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/06/08 08:57:22

Modified files:
        org/fenfire/demo: buoyoing.py 

Log message:
        right click focuses buoy in other focus, articles can only be in upper 
focus

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/buoyoing.py.diff?tr1=1.63&tr2=1.64&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/demo/buoyoing.py
diff -u fenfire/org/fenfire/demo/buoyoing.py:1.63 
fenfire/org/fenfire/demo/buoyoing.py:1.64
--- fenfire/org/fenfire/demo/buoyoing.py:1.63   Sun Jun  8 08:13:43 2003
+++ fenfire/org/fenfire/demo/buoyoing.py        Sun Jun  8 08:57:22 2003
@@ -217,24 +217,24 @@
 
         if (dbg): pa("SET DOUBLE ", h0, h1, w0, w1, s0, s1, buoywidth0, 
buoywidth1)
 
-       vs.coords.setOrthoBoxParams(self.into1, 0, 
+       vs.coords.setOrthoBoxParams(self.into1, 1, 
                      ctrx - .5*w0*s0,
-                      40,
+                      0,
                      s0, s0, 
                      w0, h0)
 
-       vs.coords.setOrthoBoxParams(self.into2, 0, 
+       vs.coords.setOrthoBoxParams(self.into2, 1, 
                      -50,
                       h-h1+50,
                      s1, s1, 
                      w1/s1, h1/s1)
 
-       vs.coords.setOrthoBoxParams(self.buoyinto1, 0, 
+       vs.coords.setOrthoBoxParams(self.buoyinto1, 1, 
                      ctrx - .5*buoywidth0, 0 +  .5*h0 - .5*buoyheight0,
                      s0, s0, 
                      buoywidth0, buoyheight0)
 
-       vs.coords.setOrthoBoxParams(self.buoyinto2, 0, 
+       vs.coords.setOrthoBoxParams(self.buoyinto2, 1, 
                      ctrx - .5*buoywidth1, 0 + h0 + .5*h1 - .5*buoyheight1,
                      s1, s1, 
                      buoywidth1, buoyheight1)
@@ -265,6 +265,26 @@
            return 1
 
        return 0
+
+    def buoyMouse(self, mgr, ev, single, link):
+        if ev.getID() != ev.MOUSE_CLICKED:
+            return 1
+
+        if not (ev.getModifiers() in [ev.BUTTON1_MASK, ev.BUTTON3_MASK]):
+            return 1
+
+        if isinstance(link[0].getView2D(), ff.view.PageScrollView2D):
+            mgr.singles[0].followLink(link)
+        elif ev.getModifiers() == ev.BUTTON1_MASK:
+            single.followLink(link)
+        else:
+            if mgr.singles[0] == single:
+                mgr.singles[1].followLink(link)
+            else:
+                mgr.singles[0].followLink(link)
+
+        vob.AbstractUpdateManager.chg()
+        return 1
 
     def key(self, key):
         if key == "+":