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

simplify and fix logic to do the "right" thing. Hard to describe, try 

2008-04-14  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppolygonselecttool.c
	(gimp_polygon_select_tool_button_release): simplify and fix logic
	to do the "right" thing. Hard to describe, try youself ;)


svn path=/trunk/; revision=25485
This commit is contained in:
Michael Natterer 2008-04-14 12:50:21 +00:00 committed by Michael Natterer
parent 5ab6f922d2
commit 3a2cbab0db
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-04-14 Michael Natterer <mitch@gimp.org>
* app/tools/gimppolygonselecttool.c
(gimp_polygon_select_tool_button_release): simplify and fix logic
to do the "right" thing. Hard to describe, try youself ;)
2008-04-14 Sven Neumann <sven@gimp.org>
* app/display/gimpstatusbar.c: introduced a #define for the spacing

59
app/tools/gimppolygonselecttool.c
View File

@ -389,31 +389,6 @@ gimp_polygon_select_tool_button_release (GimpTool *tool,
switch (release_type)
{
case GIMP_BUTTON_RELEASE_CLICK:
if (gimp_polygon_select_tool_should_close (poly_sel_tool,
display,
coords))
{
gimp_polygon_select_tool_commit (poly_sel_tool, display);
break;
}
/* Fall through */
case GIMP_BUTTON_RELEASE_NORMAL:
if (! poly_sel_tool->grabbed_point)
{
gimp_polygon_select_tool_add_point (poly_sel_tool,
coords->x, coords->y);
}
else
{
/* We don't need to do anything since the grabbed point have
* already been moved in _motion.
*/
}
break;
case GIMP_BUTTON_RELEASE_CANCEL:
if (poly_sel_tool->grabbed_point)
{
@ -422,16 +397,38 @@ gimp_polygon_select_tool_button_release (GimpTool *tool,
break;
case GIMP_BUTTON_RELEASE_NO_MOTION:
if (gimp_image_floating_sel (display->image))
if (poly_sel_tool->n_points == 0)
{
/* If there is a floating selection, anchor it */
floating_sel_anchor (gimp_image_floating_sel (display->image));
if (gimp_image_floating_sel (display->image))
{
/* If there is a floating selection, anchor it */
floating_sel_anchor (gimp_image_floating_sel (display->image));
}
else
{
/* Otherwise, clear the selection mask */
gimp_channel_clear (gimp_image_get_mask (display->image), NULL, TRUE);
}
gimp_image_flush (display->image);
break;
}
else
/* else fall through */
default:
if (gimp_polygon_select_tool_should_close (poly_sel_tool,
display,
coords))
{
/* Otherwise, clear the selection mask */
gimp_channel_clear (gimp_image_get_mask (display->image), NULL, TRUE);
gimp_polygon_select_tool_commit (poly_sel_tool, display);
}
else if (! poly_sel_tool->grabbed_point)
{
gimp_polygon_select_tool_add_point (poly_sel_tool,
coords->x, coords->y);
}
break;
}