dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made the Foreground Select Tool work again. 

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.

svn path=/trunk/; revision=25735
This commit is contained in:
Martin Nordholts 2008-05-21 18:23:23 +00:00 committed by Martin Nordholts
parent a786d4deab
commit 3842f7cb03
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,21 @@
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.
2008-05-21 Sven Neumann <sven@gimp.org>
* app/core/Makefile.am
@ -17,8 +35,8 @@
2008-05-21 Martin Nordholts <martinn@svn.gnome.org>
* app/tools/gimpfreeselecttool.c
(gimp_free_select_tool_status_update): Slightly improve one of the
status bar messages.
(gimp_free_select_tool_status_update): Slightly improve one of
the status bar messages.
2008-05-21 Sven Neumann <sven@gimp.org>

5
app/tools/gimpforegroundselecttool.c
View File

@ -271,6 +271,8 @@ gimp_foreground_select_tool_control (GimpTool *tool,
gimp_drawable_foreground_extract_siox_done (fg_select->state);
fg_select->state = NULL;
}
tool->display = NULL;
}
break;
}
@ -441,7 +443,8 @@ gimp_foreground_select_tool_button_press (GimpTool *tool,
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;

4
app/tools/gimpfreeselecttool.c
View File

@ -597,8 +597,6 @@ gimp_free_select_tool_commit (GimpFreeSelectTool *fst,
gimp_free_select_tool_select (fst, display);
}
gimp_free_select_tool_halt (fst);
gimp_image_flush (display->image);
}
@ -1094,5 +1092,7 @@ gimp_free_select_tool_real_select (GimpFreeSelectTool *fst,
options->feather_radius,
options->feather_radius,
TRUE);
gimp_free_select_tool_halt (fst);
}