gegl r2723 - in trunk: . bin

[ok svn gnome org]

Author: ok
Date: Mon Nov 10 21:45:50 2008
New Revision: 2723
URL: http://svn.gnome.org/viewvc/gegl?rev=2723&view=rev

Log:
* bin/editor.c: (gui_press_event), (gui_release_event): made pie menu
remain visible on right mouse button release. After it is brought up
it is activate with left mouse button click inside the pies, all other
clicks will cancel the menu.


Modified:
   trunk/ChangeLog
   trunk/bin/editor.c

Modified: trunk/bin/editor.c
==============================================================================
--- trunk/bin/editor.c	(original)
+++ trunk/bin/editor.c	Mon Nov 10 21:45:50 2008
@@ -1285,10 +1285,40 @@
                     GdkEventButton *event,
                     gpointer        data)
 {
+  if (tools.menu_active)
+    {
+        {
+          if (event->button==1)
+            {
+              gint active = tools.menu_segment_active;
+              if (active >= 0)
+                {
+                  void (*cb) (gpointer) = (void*)tools.menu_segment_callback[active];
+
+                  if (cb)
+                   cb (tools.menu_segment_userdata[active]);
+                }
+            }
+          gtk_widget_queue_draw (widget);
+          tools.menu_active = FALSE;
+          return TRUE;
+        }
+    }
   if (event->button == 3)
     {
       if (tools.menu_active)
         {
+          gint active = tools.menu_segment_active;
+
+          tools.menu_active = FALSE;
+          if (active >= 0)
+            {
+              void (*cb) (gpointer) = (void*)tools.menu_segment_callback[active];
+
+              if (cb)
+               cb (tools.menu_segment_userdata[active]);
+            }
+          gtk_widget_queue_draw (widget);
           tools.menu_active = FALSE;
         }
       else
@@ -1533,6 +1563,7 @@
 {
   if (tools.menu_active)
       {
+#if 0
         gint active = tools.menu_segment_active;
 
         tools.menu_active = FALSE;
@@ -1544,6 +1575,7 @@
              cb (tools.menu_segment_userdata[active]);
           }
         gtk_widget_queue_draw (widget);
+#endif
       }
 
   switch (tools.state)