callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always look for the active drawable, not for the active layer. Fixes line

Browse Source 
2003-08-19  Michael Natterer  <mitch@gimp.org>

	* app/tools/gimppainttool.c
	(gimp_paint_tool_oper_update,cursor_update): always look for the
	active drawable, not for the active layer. Fixes line and brush
	preview drawing for channels.
This commit is contained in:
Michael Natterer
2003-08-19 18:04:40 +00:00
committed by Michael Natterer
parent 52ccb9557b
commit 82ac2e384f
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2,6 +2,13 @@
* app/gui/toolbox-menu.c: use the new icons here as well. * app/gui/toolbox-menu.c: use the new icons here as well.
2003-08-19 Michael Natterer <mitch@gimp.org>
* app/tools/gimppainttool.c
(gimp_paint_tool_oper_update,cursor_update): always look for the
active drawable, not for the active layer. Fixes line and brush
preview drawing for channels.
2003-08-19 Michael Natterer <mitch@gimp.org> 2003-08-19 Michael Natterer <mitch@gimp.org>
* app/config/gimpdisplayconfig.[ch] * app/config/gimpdisplayconfig.[ch]

21
app/tools/gimpbrushtool.c
View File

@ -31,7 +31,12 @@
#include "config/gimpdisplayconfig.h" #include "config/gimpdisplayconfig.h"
#include "base/boundary.h"
#include "base/pixel-region.h"
#include "base/temp-buf.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpbrush.h"
#include "core/gimpdrawable.h" #include "core/gimpdrawable.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
@ -51,14 +56,6 @@
#include "gimptoolcontrol.h" #include "gimptoolcontrol.h"
#include "tool_manager.h" #include "tool_manager.h"
#include "base/boundary.h"
#include "base/pixel-region.h"
#include "base/temp-buf.h"
#include "core/gimpbrush.h"
#include "display/gimpdisplayshell-transform.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -561,7 +558,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
GimpDrawTool *draw_tool; GimpDrawTool *draw_tool;
GimpPaintCore *core; GimpPaintCore *core;
GimpDisplayShell *shell; GimpDisplayShell *shell;
GimpLayer *layer; GimpDrawable *drawable;
paint_tool = GIMP_PAINT_TOOL (tool); paint_tool = GIMP_PAINT_TOOL (tool);
draw_tool = GIMP_DRAW_TOOL (tool); draw_tool = GIMP_DRAW_TOOL (tool);
@ -608,7 +605,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
tool->gdisp = gdisp; tool->gdisp = gdisp;
} }
if ((layer = gimp_image_get_active_layer (gdisp->gimage))) if ((drawable = gimp_image_active_drawable (gdisp->gimage)))
{ {
paint_tool->brush_x = coords->x; paint_tool->brush_x = coords->x;
paint_tool->brush_y = coords->y; paint_tool->brush_y = coords->y;
@ -625,7 +622,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
core->cur_coords = *coords; core->cur_coords = *coords;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y); gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
core->cur_coords.x -= off_x; core->cur_coords.x -= off_x;
core->cur_coords.y -= off_y; core->cur_coords.y -= off_y;
@ -682,7 +679,7 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
GdkModifierType state, GdkModifierType state,
GimpDisplay *gdisp) GimpDisplay *gdisp)
{ {
if (gimp_image_get_active_layer (gdisp->gimage)) if (gimp_image_active_drawable (gdisp->gimage))
{ {
GimpDrawTool *draw_tool; GimpDrawTool *draw_tool;
GimpDisplayShell *shell; GimpDisplayShell *shell;

21
app/tools/gimppainttool.c
View File

@ -31,7 +31,12 @@
#include "config/gimpdisplayconfig.h" #include "config/gimpdisplayconfig.h"
#include "base/boundary.h"
#include "base/pixel-region.h"
#include "base/temp-buf.h"
#include "core/gimp.h" #include "core/gimp.h"
#include "core/gimpbrush.h"
#include "core/gimpdrawable.h" #include "core/gimpdrawable.h"
#include "core/gimpimage.h" #include "core/gimpimage.h"
#include "core/gimptoolinfo.h" #include "core/gimptoolinfo.h"
@ -51,14 +56,6 @@
#include "gimptoolcontrol.h" #include "gimptoolcontrol.h"
#include "tool_manager.h" #include "tool_manager.h"
#include "base/boundary.h"
#include "base/pixel-region.h"
#include "base/temp-buf.h"
#include "core/gimpbrush.h"
#include "display/gimpdisplayshell-transform.h"
#include "gimp-intl.h" #include "gimp-intl.h"
@ -561,7 +558,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
GimpDrawTool *draw_tool; GimpDrawTool *draw_tool;
GimpPaintCore *core; GimpPaintCore *core;
GimpDisplayShell *shell; GimpDisplayShell *shell;
GimpLayer *layer; GimpDrawable *drawable;
paint_tool = GIMP_PAINT_TOOL (tool); paint_tool = GIMP_PAINT_TOOL (tool);
draw_tool = GIMP_DRAW_TOOL (tool); draw_tool = GIMP_DRAW_TOOL (tool);
@ -608,7 +605,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
tool->gdisp = gdisp; tool->gdisp = gdisp;
} }
if ((layer = gimp_image_get_active_layer (gdisp->gimage))) if ((drawable = gimp_image_active_drawable (gdisp->gimage)))
{ {
paint_tool->brush_x = coords->x; paint_tool->brush_x = coords->x;
paint_tool->brush_y = coords->y; paint_tool->brush_y = coords->y;
@ -625,7 +622,7 @@ gimp_paint_tool_oper_update (GimpTool *tool,
core->cur_coords = *coords; core->cur_coords = *coords;
gimp_item_offsets (GIMP_ITEM (layer), &off_x, &off_y); gimp_item_offsets (GIMP_ITEM (drawable), &off_x, &off_y);
core->cur_coords.x -= off_x; core->cur_coords.x -= off_x;
core->cur_coords.y -= off_y; core->cur_coords.y -= off_y;
@ -682,7 +679,7 @@ gimp_paint_tool_cursor_update (GimpTool *tool,
GdkModifierType state, GdkModifierType state,
GimpDisplay *gdisp) GimpDisplay *gdisp)
{ {
if (gimp_image_get_active_layer (gdisp->gimage)) if (gimp_image_active_drawable (gdisp->gimage))
{ {
GimpDrawTool *draw_tool; GimpDrawTool *draw_tool;
GimpDisplayShell *shell; GimpDisplayShell *shell;