gimp r25735 - in trunk: . app/tools

[martinn svn gnome org]

Author: martinn
Date: Wed May 21 18:23:23 2008
New Revision: 25735
URL: http://svn.gnome.org/viewvc/gimp?rev=25735&view=rev

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

	Made the Foreground Select Tool work again.

	* app/tools/gimpforegroundselecttool.c
	(gimp_foreground_select_tool_control): Set tool->display =
	NULL when halting the tool.

	(gimp_foreground_select_tool_button_press): Only activate the
	tool control if it is not active (it might be actived already
	by the Free Select Tool).

	* app/tools/gimpfreeselecttool.c
	(gimp_free_select_tool_commit): Don't _halt explicitly
	here. If a tool implementation wants to halt in this
	situation, let them do that in their
	GimpFreeSelectTool::select() instead.


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

Modified: trunk/app/tools/gimpforegroundselecttool.c
==============================================================================
--- trunk/app/tools/gimpforegroundselecttool.c	(original)
+++ trunk/app/tools/gimpforegroundselecttool.c	Wed May 21 18:23:23 2008
@@ -271,6 +271,8 @@
             gimp_drawable_foreground_extract_siox_done (fg_select->state);
             fg_select->state = NULL;
           }
+
+        tool->display = NULL;
       }
       break;
     }
@@ -441,7 +443,8 @@
       if (gimp_draw_tool_is_active (draw_tool) && draw_tool->display != display)
         gimp_draw_tool_stop (draw_tool);
 
-      gimp_tool_control_activate (tool->control);
+      if (! gimp_tool_control_is_active (tool->control))
+        gimp_tool_control_activate (tool->control);
 
       fg_select->last_coords = *coords;
 

Modified: trunk/app/tools/gimpfreeselecttool.c
==============================================================================
--- trunk/app/tools/gimpfreeselecttool.c	(original)
+++ trunk/app/tools/gimpfreeselecttool.c	Wed May 21 18:23:23 2008
@@ -597,8 +597,6 @@
       gimp_free_select_tool_select (fst, display);
     }
 
-  gimp_free_select_tool_halt (fst);
-
   gimp_image_flush (display->image);
 }
 
@@ -1094,5 +1092,7 @@
                                options->feather_radius,
                                options->feather_radius,
                                TRUE);
+
+  gimp_free_select_tool_halt (fst);
 }