don't set paused_count to 0.
2003-01-03 Michael Natterer <mitch@gimp.org> * 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.
This commit is contained in:
parent
7e5549e214
commit
ef3f572af4
25 changed files with 23 additions and 26 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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) &&
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue