gimp r25796 - in trunk: . app/tools

[martinn svn gnome org]

Author: martinn
Date: Sun May 25 15:08:50 2008
New Revision: 25796
URL: http://svn.gnome.org/viewvc/gimp?rev=25796&view=rev

Log:
2008-05-25  Martin Nordholts  <martinn svn gnome org>

	* app/tools/gimpfreeselecttool.c
	(gimp_free_select_tool_cursor_update): Properly update the cursor.


Modified:
   trunk/ChangeLog
   trunk/app/tools/gimpfreeselecttool.c

Modified: trunk/app/tools/gimpfreeselecttool.c
==============================================================================
--- trunk/app/tools/gimpfreeselecttool.c	(original)
+++ trunk/app/tools/gimpfreeselecttool.c	Sun May 25 15:08:50 2008
@@ -1115,25 +1115,35 @@
 {
   GimpFreeSelectTool *fst = GIMP_FREE_SELECT_TOOL (tool);
 
-  if (gimp_free_select_tool_is_point_grabbed (fst) &&
-      ! gimp_free_select_tool_should_close (fst,
-                                            display,
-                                            NO_CLICK_TIME_AVAILABLE,
-                                            coords))
-    {
-      gimp_tool_set_cursor (tool, display,
-                            gimp_tool_control_get_cursor (tool->control),
-                            gimp_tool_control_get_tool_cursor (tool->control),
-                            GIMP_CURSOR_MODIFIER_MOVE);
-
-    }
-  else
+  if (tool->display == NULL)
     {
       GIMP_TOOL_CLASS (parent_class)->cursor_update (tool,
                                                      coords,
                                                      state,
                                                      display);
     }
+  else
+    {
+      GimpCursorModifier modifier;
+
+      if (gimp_free_select_tool_is_point_grabbed (fst) &&
+          ! gimp_free_select_tool_should_close (fst,
+                                                display,
+                                                NO_CLICK_TIME_AVAILABLE,
+                                                coords))
+        {
+          modifier = GIMP_CURSOR_MODIFIER_MOVE;
+        }
+      else
+        {
+          modifier = GIMP_CURSOR_MODIFIER_NONE;
+        }
+
+      gimp_tool_set_cursor (tool, display,
+                            gimp_tool_control_get_cursor (tool->control),
+                            gimp_tool_control_get_tool_cursor (tool->control),
+                            modifier);
+    }
 }
 
 static void