Commit 04ed4a8a authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

if the color tool is enabled, skip cursor hiding entirely.

2004-07-03  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppainttool.c (gimp_paint_tool_cursor_update): if
	the color tool is enabled, skip cursor hiding entirely.
parent 87ee13fa
2004-07-03 Michael Natterer <mitch@gimp.org>
* app/tools/gimppainttool.c (gimp_paint_tool_cursor_update): if
the color tool is enabled, skip cursor hiding entirely.
2004-07-03 Sven Neumann <sven@gimp.org>
* plug-ins/common/dog.c (dog): removed #ifdef'ed code that isn't
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment