dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Chain up if the color tool is enabled. This fixes the problem of the color 

2004-06-30  Philip Lafleur  <plafleur@cvs.gnome.org>

	* app/tools/gimppainttool.c (gimp_paint_tool_cursor_update):
	Chain up if the color tool is enabled. This fixes the problem of
	the color picker cursor not appearing when using a paint tool
	in color picking mode while "Show Paint Tool Cursor" is off.
This commit is contained in:
Philip Lafleur 2004-07-01 00:12:29 +00:00 committed by Philip Lafleur
parent 10ffa7d90b
commit bbed5b577b
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-06-30 Philip Lafleur <plafleur@cvs.gnome.org>
* app/tools/gimppainttool.c (gimp_paint_tool_cursor_update):
Chain up if the color tool is enabled. This fixes the problem of
the color picker cursor not appearing when using a paint tool
in color picking mode while "Show Paint Tool Cursor" is off.
2004-06-30 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* libgimp/gimpdrawable.c: moved call to

5
app/tools/gimpbrushtool.c
View File

@ -837,6 +837,7 @@ 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)
{
@ -844,7 +845,9 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
GIMP_CURSOR_NONE,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
return;
if (! color_tool->enabled)
return;
}
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);

5
app/tools/gimppainttool.c
View File

@ -837,6 +837,7 @@ 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)
{
@ -844,7 +845,9 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
GIMP_CURSOR_NONE,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
return;
if (! color_tool->enabled)
return;
}
GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, gdisp);