From ef3f572af4e1c96dfc2a55fdb28bb723afc4e2e5 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 3 Jan 2003 13:59:23 +0000 Subject: [PATCH] don't set paused_count to 0. 2003-01-03 Michael Natterer * app/tools/gimptoolcontrol.c (gimp_tool_control_halt): don't set paused_count to 0. * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpcroptool.c * app/tools/gimpeditselectiontool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpinktool.c * app/tools/gimpiscissorstool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimppainttool.c * app/tools/gimppathtool.c * app/tools/gimprectselecttool.c * app/tools/gimptexttool.c * app/tools/gimptool.c * app/tools/gimptransformtool.c * app/tools/gimpvectortool.c * app/tools/tool_manager.c: removed comments about doing so. --- app/paint/gimpink.c | 2 +- app/tools/gimpblendtool.c | 2 +- app/tools/gimpbrushtool.c | 2 +- app/tools/gimpbucketfilltool.c | 2 +- app/tools/gimpbycolorselecttool.c | 2 +- app/tools/gimpcolorpickertool.c | 2 +- app/tools/gimpcroptool.c | 2 +- app/tools/gimpeditselectiontool.c | 2 +- app/tools/gimpfreeselecttool.c | 2 +- app/tools/gimpfuzzyselecttool.c | 2 +- app/tools/gimpinktool.c | 2 +- app/tools/gimpiscissorstool.c | 2 +- app/tools/gimpmagnifytool.c | 2 +- app/tools/gimpmeasuretool.c | 2 +- app/tools/gimpmovetool.c | 2 +- app/tools/gimppainttool.c | 2 +- app/tools/gimppathtool.c | 2 +- app/tools/gimprectselecttool.c | 2 +- app/tools/gimpregionselecttool.c | 2 +- app/tools/gimptexttool.c | 1 - app/tools/gimptool.c | 2 +- app/tools/gimptoolcontrol.c | 1 - app/tools/gimptransformtool.c | 4 ++-- app/tools/gimpvectortool.c | 2 +- app/tools/tool_manager.c | 1 - 25 files changed, 23 insertions(+), 26 deletions(-) diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c index b94f76c5dd..77f57f172c 100644 --- a/app/paint/gimpink.c +++ b/app/paint/gimpink.c @@ -430,7 +430,7 @@ gimp_ink_tool_button_release (GimpTool *tool, gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_RESUME); /* Set tool state to inactive -- no longer painting */ - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* free the last blob */ g_free (ink_tool->last_blob); diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c index c373b2b8fa..9fbe1fa4c2 100644 --- a/app/tools/gimpblendtool.c +++ b/app/tools/gimpblendtool.c @@ -279,7 +279,7 @@ gimp_blend_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* if the 3rd button isn't pressed, fill the selected region */ if (! (state & GDK_BUTTON3_MASK) && diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c index 04d7fa9872..93e082d5c1 100644 --- a/app/tools/gimpbrushtool.c +++ b/app/tools/gimpbrushtool.c @@ -415,7 +415,7 @@ gimp_paint_tool_button_release (GimpTool *tool, gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_RESUME); /* Set tool state to inactive -- no longer painting */ - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); gimp_paint_core_finish (core, drawable); diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c index 68ba02585e..643c78db65 100644 --- a/app/tools/gimpbucketfilltool.c +++ b/app/tools/gimpbucketfilltool.c @@ -247,7 +247,7 @@ gimp_bucket_fill_tool_button_release (GimpTool *tool, gimp_image_flush (gdisp->gimage); } - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); } static void diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c index b0b985d124..3ffc371417 100644 --- a/app/tools/gimpbycolorselecttool.c +++ b/app/tools/gimpbycolorselecttool.c @@ -198,7 +198,7 @@ gimp_by_color_select_tool_button_release (GimpTool *tool, drawable = gimp_image_active_drawable (gdisp->gimage); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* First take care of the case where the user "cancels" the action */ if (! (state & GDK_BUTTON3_MASK)) diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index 3801c2f728..e3191c42e1 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -341,7 +341,7 @@ gimp_color_picker_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (cp_tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); } static void diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c index 6f991260a4..d7c3dfea27 100644 --- a/app/tools/gimpcroptool.c +++ b/app/tools/gimpcroptool.c @@ -1112,7 +1112,7 @@ crop_cancel_callback (GtkWidget *widget, if (gimp_tool_control_is_active (GIMP_TOOL (crop)->control)) gimp_draw_tool_stop (GIMP_DRAW_TOOL (crop)); - gimp_tool_control_halt (GIMP_TOOL (crop)->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (GIMP_TOOL (crop)->control); if (crop->crop_info) info_dialog_popdown (crop->crop_info); diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c index 843538647b..b87207944f 100644 --- a/app/tools/gimpeditselectiontool.c +++ b/app/tools/gimpeditselectiontool.c @@ -330,7 +330,7 @@ gimp_edit_selection_tool_button_release (GimpTool *tool, tool_manager_pop_tool (gdisp->gimage->gimp); - gimp_tool_control_halt (tool_manager_get_active (gdisp->gimage->gimp)->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool_manager_get_active (gdisp->gimage->gimp)->control); /* EDIT_MASK_TRANSLATE is performed here at movement end, not 'live' like * the other translation types. diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 539793fc67..f3805080e5 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -232,7 +232,7 @@ gimp_free_select_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* First take care of the case where the user "cancels" the action */ if (! (state & GDK_BUTTON3_MASK)) diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c index 4957042a2e..2052d48416 100644 --- a/app/tools/gimpfuzzyselecttool.c +++ b/app/tools/gimpfuzzyselecttool.c @@ -256,7 +256,7 @@ gimp_fuzzy_select_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* First take care of the case where the user "cancels" the action */ if (! (state & GDK_BUTTON3_MASK)) diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index b94f76c5dd..77f57f172c 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -430,7 +430,7 @@ gimp_ink_tool_button_release (GimpTool *tool, gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_RESUME); /* Set tool state to inactive -- no longer painting */ - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* free the last blob */ g_free (ink_tool->last_blob); diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c index ca07ef521c..3271d86896 100644 --- a/app/tools/gimpiscissorstool.c +++ b/app/tools/gimpiscissorstool.c @@ -485,7 +485,7 @@ gimp_iscissors_tool_button_press (GimpTool *tool, iscissors->y)) { /* Undraw the curve */ - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); iscissors->draw = DRAW_CURVE; gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c index e635e7dd29..7a7fc6bf86 100644 --- a/app/tools/gimpmagnifytool.c +++ b/app/tools/gimpmagnifytool.c @@ -254,7 +254,7 @@ gimp_magnify_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* First take care of the case where the user "cancels" the action */ if (! (state & GDK_BUTTON3_MASK)) diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 7bc38e2c64..82a9e65f16 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -222,7 +222,7 @@ gimp_measure_tool_control (GimpTool *tool, case HALT: gimp_tool_pop_status (tool); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); break; default: diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index cecd7e9003..d08b05a70e 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -323,7 +323,7 @@ gimp_move_tool_button_release (GimpTool *tool, shell = GIMP_DISPLAY_SHELL (gdisp->shell); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); if (move->guide) { diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index 04d7fa9872..93e082d5c1 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -415,7 +415,7 @@ gimp_paint_tool_button_release (GimpTool *tool, gimp_image_selection_control (gdisp->gimage, GIMP_SELECTION_RESUME); /* Set tool state to inactive -- no longer painting */ - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); gimp_paint_core_finish (core, drawable); diff --git a/app/tools/gimppathtool.c b/app/tools/gimppathtool.c index dc774541b4..5e8df2761c 100644 --- a/app/tools/gimppathtool.c +++ b/app/tools/gimppathtool.c @@ -249,7 +249,7 @@ gimp_path_tool_control (GimpTool *tool, break; case HALT: - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); break; default: diff --git a/app/tools/gimprectselecttool.c b/app/tools/gimprectselecttool.c index 8948fbdcd0..be82c6b6a4 100644 --- a/app/tools/gimprectselecttool.c +++ b/app/tools/gimprectselecttool.c @@ -270,7 +270,7 @@ gimp_rect_select_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* First take care of the case where the user "cancels" the action */ if (! (state & GDK_BUTTON3_MASK)) diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c index 4957042a2e..2052d48416 100644 --- a/app/tools/gimpregionselecttool.c +++ b/app/tools/gimpregionselecttool.c @@ -256,7 +256,7 @@ gimp_fuzzy_select_tool_button_release (GimpTool *tool, gimp_draw_tool_stop (GIMP_DRAW_TOOL (tool)); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); /* First take care of the case where the user "cancels" the action */ if (! (state & GDK_BUTTON3_MASK)) diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 9fb07d373f..07c521f867 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -296,7 +296,6 @@ text_tool_button_release (GimpTool *tool, GdkModifierType state, GimpDisplay *gdisp) { - /* sets paused_count to 0 -- is this ok? */ gimp_tool_control_halt (tool->control); } diff --git a/app/tools/gimptool.c b/app/tools/gimptool.c index 35646b2678..2107b29f4b 100644 --- a/app/tools/gimptool.c +++ b/app/tools/gimptool.c @@ -122,6 +122,6 @@ gimp_tool_real_button_release (GimpTool *tool, GdkModifierType state, GimpDisplay *gdisp) { - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); } diff --git a/app/tools/gimptoolcontrol.c b/app/tools/gimptoolcontrol.c index 6b67806994..78bdb1b888 100644 --- a/app/tools/gimptoolcontrol.c +++ b/app/tools/gimptoolcontrol.c @@ -128,7 +128,6 @@ gimp_tool_control_halt (GimpToolControl *control) g_return_if_fail (GIMP_IS_TOOL_CONTROL (control)); control->state = INACTIVE; - control->paused_count = 0; } gboolean diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c index 9841efe89a..121c74e7ef 100644 --- a/app/tools/gimptransformtool.c +++ b/app/tools/gimptransformtool.c @@ -328,7 +328,7 @@ gimp_transform_tool_button_press (GimpTool *tool, { g_message (_("Transformations do not work on\n" "layers that contain layer masks.")); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); return; } @@ -916,7 +916,7 @@ gimp_transform_tool_reset (GimpTransformTool *tr_tool) if (tr_tool->info_dialog) info_dialog_popdown (tr_tool->info_dialog); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); tool->gdisp = NULL; tool->drawable = NULL; } diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c index b98249b78a..dc5ae83458 100644 --- a/app/tools/gimpvectortool.c +++ b/app/tools/gimpvectortool.c @@ -219,7 +219,7 @@ gimp_vector_tool_control (GimpTool *tool, case HALT: gimp_tool_pop_status (tool); - gimp_tool_control_halt (tool->control); /* sets paused_count to 0 -- is this ok? */ + gimp_tool_control_halt (tool->control); break; default: diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c index adbb81966b..b0038d1e4f 100644 --- a/app/tools/tool_manager.c +++ b/app/tools/tool_manager.c @@ -332,7 +332,6 @@ tool_manager_control_active (Gimp *gimp, } else if (action == HALT) { - /* sets paused_count to 0 -- is this ok? */ gimp_tool_control_halt (tool_manager->active_tool->control); } }