From 04ed4a8a0f0caf29a114ab42b962cd60a77a59e7 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 3 Jul 2004 13:07:30 +0000 Subject: [PATCH] if the color tool is enabled, skip cursor hiding entirely. 2004-07-03 Michael Natterer * app/tools/gimppainttool.c (gimp_paint_tool_cursor_update): if the color tool is enabled, skip cursor hiding entirely. --- ChangeLog | 5 +++++ app/tools/gimpbrushtool.c | 7 +++---- app/tools/gimppainttool.c | 7 +++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74b0b73e0c..27be348466 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-03 Michael Natterer + + * app/tools/gimppainttool.c (gimp_paint_tool_cursor_update): if + the color tool is enabled, skip cursor hiding entirely. + 2004-07-03 Sven Neumann * plug-ins/common/dog.c (dog): removed #ifdef'ed code that isn't diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c index 534bcb1e88..a5b18cee5b 100644 --- a/app/tools/gimpbrushtool.c +++ b/app/tools/gimpbrushtool.c @@ -837,17 +837,16 @@ gimp_paint_tool_cursor_update (GimpTool *tool, GimpDisplay *gdisp) { GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); - GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool); - if (! paint_tool->show_cursor) + if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)) && + ! paint_tool->show_cursor) { gimp_tool_set_cursor (tool, gdisp, GIMP_CURSOR_NONE, GIMP_TOOL_CURSOR_NONE, GIMP_CURSOR_MODIFIER_NONE); - if (! color_tool->enabled) - return; + return; } GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp); diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index 534bcb1e88..a5b18cee5b 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -837,17 +837,16 @@ gimp_paint_tool_cursor_update (GimpTool *tool, GimpDisplay *gdisp) { GimpPaintTool *paint_tool = GIMP_PAINT_TOOL (tool); - GimpColorTool *color_tool = GIMP_COLOR_TOOL (tool); - if (! paint_tool->show_cursor) + if (! gimp_color_tool_is_enabled (GIMP_COLOR_TOOL (tool)) && + ! paint_tool->show_cursor) { gimp_tool_set_cursor (tool, gdisp, GIMP_CURSOR_NONE, GIMP_TOOL_CURSOR_NONE, GIMP_CURSOR_MODIFIER_NONE); - if (! color_tool->enabled) - return; + return; } GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);