if we are in adjust mode, skip the GimpBrushClass when chaining up. Fixes

2007-05-02  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpperspectiveclonetool.c
	(gimp_perspective_clone_tool_cursor_update): if we are in adjust
	mode, skip the GimpBrushClass when chaining up. Fixes bug #354933.

svn path=/trunk/; revision=22379
This commit is contained in:
Sven Neumann 2007-05-02 13:24:14 +00:00 committed by Sven Neumann
parent 5dc6e7ed2a
commit 6a9db536e9
2 changed files with 17 additions and 1 deletions

View File

@ -1,3 +1,9 @@
2007-05-02 Sven Neumann <sven@gimp.org>
* app/tools/gimpperspectiveclonetool.c
(gimp_perspective_clone_tool_cursor_update): if we are in adjust
mode, skip the GimpBrushClass when chaining up. Fixes bug #354933.
2007-05-02 Sven Neumann <sven@gimp.org>
* plug-ins/script-fu/scheme-wrapper.c (ts_get_error_msg): applied

View File

@ -497,6 +497,7 @@ gimp_perspective_clone_tool_cursor_update (GimpTool *tool,
{
GimpPerspectiveCloneTool *clone_tool = GIMP_PERSPECTIVE_CLONE_TOOL (tool);
GimpPerspectiveCloneOptions *options;
GimpToolClass *tool_class;
GimpCursorType cursor = GIMP_CURSOR_MOUSE;
GimpCursorModifier modifier = GIMP_CURSOR_MODIFIER_NONE;
@ -557,7 +558,16 @@ gimp_perspective_clone_tool_cursor_update (GimpTool *tool,
gimp_tool_control_set_cursor (tool->control, cursor);
gimp_tool_control_set_cursor_modifier (tool->control, modifier);
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
/* If we are in adjust mode, skip the GimpBrushClass when chaining up.
* This ensures that the cursor will be set regardless of
* GimpBrushTool::show_cursor (see bug #354933).
*/
if (options->clone_mode == GIMP_PERSPECTIVE_CLONE_MODE_ADJUST)
tool_class = GIMP_TOOL_CLASS (g_type_class_peek_parent (parent_class));
else
tool_class = GIMP_TOOL_CLASS (parent_class);
tool_class->cursor_update (tool, coords, state, display);
}
static void