gegl r2708 - in trunk: . bin

[ok svn gnome org]

Author: ok
Date: Sat Nov  8 23:11:35 2008
New Revision: 2708
URL: http://svn.gnome.org/viewvc/gegl?rev=2708&view=rev

Log:
* bin/editor.c: (cairo_gui_expose), (gui_press_event): made moving the
default action (instead of just selecting).


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

Modified: trunk/bin/editor.c
==============================================================================
--- trunk/bin/editor.c	(original)
+++ trunk/bin/editor.c	Sat Nov  8 23:11:35 2008
@@ -58,9 +58,9 @@
 
 typedef enum 
 {
-  STATE_PICK = 0,
+  STATE_MOVE = 0,
   STATE_STROKES,
-  STATE_MOVE,
+  STATE_PICK,
   STATE_PAN,
   STATE_EDIT_NODES,
   STATE_EDIT_WIDTH,
@@ -997,10 +997,15 @@
 
           cairo_translate (cr, -x, -y);
           if(1)cairo_scale (cr, scale, scale);
+
+
           cairo_translate (cr, tx, ty);
               ACTIVE_COLOR;
               bounds = gegl_node_get_bounding_box (tools.node);
               cairo_rectangle (cr, bounds.x, bounds.y, bounds.width, bounds.height);
+              cairo_clip_preserve (cr);
+
+              cairo_set_line_width (cr, 4.0 / scale);
               cairo_stroke (cr);
             }
           cairo_restore (cr);
@@ -1261,11 +1266,11 @@
             
             switch (tools.state)
               {
-                case STATE_PICK:
+                case STATE_MOVE:
                   menu_add ("paint", G_CALLBACK (do_command), "set-state strokes");
                   menu_add ("path",  G_CALLBACK (do_command), "set-state edit-nodes");
                   menu_add ("width",  G_CALLBACK (do_command), "set-state edit-width");
-                  menu_add ("move",  G_CALLBACK (do_command), "set-state move");
+                  menu_add ("remove",  G_CALLBACK (do_command), "remove-item");
                   /* check the current curve type,. */
                   break;
                 case STATE_EDIT_NODES:
@@ -1274,7 +1279,7 @@
                   menu_add ("--", G_CALLBACK (do_command), "help");
                   menu_add ("smooth", G_CALLBACK (do_command), "help");
                   menu_add ("spiro", G_CALLBACK (do_command), "help");
-                  menu_add ("pick", G_CALLBACK (do_command), "set-state pick");
+                  menu_add ("move", G_CALLBACK (do_command), "set-state move");
                   break;
                 case STATE_EDIT_WIDTH:
                 case STATE_STROKES:
@@ -1285,7 +1290,6 @@
                   menu_add ("path",  G_CALLBACK (do_command), "set-state edit-nodes");
                   menu_add ("width",  G_CALLBACK (do_command), "set-state edit-width");
                   menu_add ("move",  G_CALLBACK (do_command), "set-state move");
-                  menu_add ("pick", G_CALLBACK (do_command), "set-state pick");
                   break;
               }