Remember the selection operation in use when the tool was started, and use
2008-05-22 Martin Nordholts <martinn@svn.gnome.org> * app/tools/gimpfreeselecttool.c: Remember the selection operation in use when the tool was started, and use that when doing the selection. Improvements are still to be made with regards to synchronizing the tool options with the selection operation actually used. svn path=/trunk/; revision=25756
This commit is contained in:

committed by
Martin Nordholts

parent
8004eba247
commit
3ba5ecb5eb
@ -1,3 +1,11 @@
|
||||
2008-05-22 Martin Nordholts <martinn@svn.gnome.org>
|
||||
|
||||
* app/tools/gimpfreeselecttool.c: Remember the selection operation
|
||||
in use when the tool was started, and use that when doing the
|
||||
selection. Improvements are still to be made with regards to
|
||||
synchronizing the tool options with the selection operation
|
||||
actually used.
|
||||
|
||||
2008-05-22 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/tools/gimpimagemaptool.c: check if the tool class has
|
||||
|
@ -98,6 +98,10 @@ typedef struct _Private
|
||||
|
||||
/* The number of segment indices actually in use */
|
||||
gint n_segment_indices;
|
||||
|
||||
/* The selection operation active when the tool was started */
|
||||
GimpChannelOps operation_at_start;
|
||||
|
||||
} Private;
|
||||
|
||||
|
||||
@ -452,8 +456,10 @@ gimp_free_select_tool_start (GimpFreeSelectTool *fst,
|
||||
GimpCoords *coords,
|
||||
GimpDisplay *display)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (fst);
|
||||
GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
|
||||
GimpTool *tool = GIMP_TOOL (fst);
|
||||
GimpDrawTool *draw_tool = GIMP_DRAW_TOOL (tool);
|
||||
GimpSelectionOptions *options = GIMP_SELECTION_TOOL_GET_OPTIONS (fst);
|
||||
Private *priv = GET_PRIVATE (fst);
|
||||
|
||||
gimp_free_select_tool_halt (fst);
|
||||
|
||||
@ -463,6 +469,10 @@ gimp_free_select_tool_start (GimpFreeSelectTool *fst,
|
||||
|
||||
gimp_draw_tool_start (draw_tool, display);
|
||||
|
||||
/* We want to apply the selection operation that was current when
|
||||
* the tool was started, so we save this information */
|
||||
priv->operation_at_start = options->operation;
|
||||
|
||||
gimp_selection_tool_start_edit (GIMP_SELECTION_TOOL (fst),
|
||||
coords);
|
||||
}
|
||||
@ -1171,7 +1181,7 @@ gimp_free_select_tool_real_select (GimpFreeSelectTool *fst,
|
||||
Q_("command|Free Select"),
|
||||
priv->n_points,
|
||||
priv->points,
|
||||
options->operation,
|
||||
priv->operation_at_start,
|
||||
options->antialias,
|
||||
options->feather,
|
||||
options->feather_radius,
|
||||
|
Reference in New Issue
Block a user