[Gzz-commits] fenfire/org/fenfire bin/fenpdf10.py demo/fenpdf...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Branch:         
Changes by:     Matti Katila <address@hidden>   03/08/12 06:46:39

Modified files:
        org/fenfire/bin: fenpdf10.py 
        org/fenfire/demo: fenpdfcontext.py 

Log message:
        mousemenu fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/bin/fenpdf10.py.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/demo/fenpdfcontext.py.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/bin/fenpdf10.py
diff -u fenfire/org/fenfire/bin/fenpdf10.py:1.26 
fenfire/org/fenfire/bin/fenpdf10.py:1.27
--- fenfire/org/fenfire/bin/fenpdf10.py:1.26    Tue Aug 12 06:08:22 2003
+++ fenfire/org/fenfire/bin/fenpdf10.py Tue Aug 12 06:46:39 2003
@@ -365,14 +365,12 @@
             return 0
 
         if self.context.doMouse(ev, oldvs):
+            p('context')
             mainMouse.flush()
             vob.AbstractUpdateManager.chg()
             return 1
-        
         return 0
 
-
-
     def buoyMouse(self, mgr, ev, single, link):
         if buoyMouse.deliverEvent(ev):
             vob.AbstractUpdateManager.chg()
@@ -452,15 +450,14 @@
         self.context.setBuoyManager(self.buoyManager)
 
     def scene(self, vs):
-        self.vs = vs
+        self.context.states.vs = vs
         scene = self.buoyManager.scene(vs)
-        if scene != None: return scene
         self.context.renderContext(vs, 0)
+        return scene
 
     def mouse(self, ev):
-        if not self.buoyManager.mouse(ev):
-            self.eventHandler.contextMouse(ev, self.vs)
-
+        if not self.eventHandler.contextMouse(ev, self.context.states.vs):
+            self.buoyManager.mouse(ev)
     def key(self, key):
         self.eventHandler.key(key)
 
Index: fenfire/org/fenfire/demo/fenpdfcontext.py
diff -u fenfire/org/fenfire/demo/fenpdfcontext.py:1.28 
fenfire/org/fenfire/demo/fenpdfcontext.py:1.29
--- fenfire/org/fenfire/demo/fenpdfcontext.py:1.28      Tue Aug 12 05:58:59 2003
+++ fenfire/org/fenfire/demo/fenpdfcontext.py   Tue Aug 12 06:46:39 2003
@@ -197,8 +197,16 @@
             main = self.states.buoymanager.getLastMain()
             if isinstance(main, ff.view.buoy.MainNode2D):
                 self.states.ppActions.deletePaper(main.getPlane())
+
+                # put a new paper int there
+                #buoymanager.replaceManager(self.states.buoymanager.lastIndex, 
+                #                           
ff.view.buoy.MainNode2D(ff.swamp.Nodes.get(self.states.ppActions.newPaper()), 
+                #                                                   
views.irregu, ff.view.buoy.AbstractMainNode2D.SimpleFocus(0,0),1,
+                #                                                   
self.states.mainMouse))
             elif isinstance(main, ff.view.buoy.FisheyeMainNode2D):
                 p('foo fish eye')
+            else:
+                p('plaah, unknow main view2d')
 
     class GoHome(Action):
         def run(self):
@@ -232,7 +240,7 @@
         self.list.add('Go to home', 'home')
 
     def render(self, vs):
-        cs = vs.orthoBoxCS(0, "MOUSE_MENU",-100, self.x, self.y-self.h/2,
+        cs = vs.orthoBoxCS(0, 'MOUSE_MENU',-100, self.x, self.y-self.h/2,
                            1,1, self.w, self.h)
         vs.put(self.list, cs)
 
@@ -257,8 +265,10 @@
 
     def mouse(self, ev, vs):
         cs = vs.matcher.getCS(0, 'MOUSE_MENU')
+        p('cs:', cs)
         key = vs.getKeyAt(cs, ev.getX(), ev.getY(), None)
         if key != None:
+            p('foobar')
             self.list.colorize(key, java.awt.Color.red)
             key = key.object
             if isinstance(key, self.Action):
@@ -266,7 +276,7 @@
             else: p('mouse menu key is: ', key)
             self.hideList()
             return 1
-
+        return 0
 
 
 class Context(ff.view.lava.ContextNodeView.Context,
@@ -299,7 +309,6 @@
                 break
             v = v.getChildView2D()
 
-        self.mousemenu.render(vs)
         #self.super.mainNodeToBeRender(vs, into, main)
 
         # draw cursor
@@ -336,6 +345,7 @@
            text.setCursorOffset(-1)
 
     def renderContext(self, vs, into):
+        self.mousemenu.render(vs)
         self.mousebuttons = cs = vs.translateCS(0, "BUTTONS",0,0)
        b = ff.view.lava.Button(vs, cs, 30, 0, 50);
         b.add("[Import PS/PDF]", "IMPORT");
@@ -344,6 +354,7 @@
        b.add("[Load]", "LOAD");
 
     def doMouse(self, ev, oldVS):
+        """ Return true if context has eaten the event ;)"""
         if self.mousemenu.mouse(ev, oldVS):
             return 1