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

Ctrl only sets the clone source when Shift isn't pressed at the same time

Browse Source 
2003-09-03  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpclonetool.c: Ctrl only sets the clone source when
	Shift isn't pressed at the same time (fixes bug #121324).
This commit is contained in:
Sven Neumann
2003-09-03 16:41:30 +00:00
committed by Sven Neumann
parent b2c141e822
commit 157dc58571
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-03 Sven Neumann <sven@gimp.org>
* app/tools/gimpclonetool.c: Ctrl only sets the clone source when
Shift isn't pressed at the same time (fixes bug #121324).
2003-09-03 Sven Neumann <sven@gimp.org> 2003-09-03 Sven Neumann <sven@gimp.org>
* app/paint-funcs/paint-funcs-generic.h (dissolve_pixels) * app/paint-funcs/paint-funcs-generic.h (dissolve_pixels)

6
app/tools/gimpclonetool.c
View File

@ -205,7 +205,7 @@ gimp_clone_tool_button_press (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool); paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK) if ((state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
GIMP_CLONE (paint_tool->core)->set_source = TRUE; GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else else
GIMP_CLONE (paint_tool->core)->set_source = FALSE; GIMP_CLONE (paint_tool->core)->set_source = FALSE;
@ -225,7 +225,7 @@ gimp_clone_tool_motion (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool); paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK) if ((state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
GIMP_CLONE (paint_tool->core)->set_source = TRUE; GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else else
GIMP_CLONE (paint_tool->core)->set_source = FALSE; GIMP_CLONE (paint_tool->core)->set_source = FALSE;
@ -259,7 +259,7 @@ gimp_clone_tool_cursor_update (GimpTool *tool,
if (options->clone_type == GIMP_IMAGE_CLONE) if (options->clone_type == GIMP_IMAGE_CLONE)
{ {
if (state & GDK_CONTROL_MASK) if ((state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
ctype = GIMP_CROSSHAIR_SMALL_CURSOR; ctype = GIMP_CROSSHAIR_SMALL_CURSOR;
else if (! GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable) else if (! GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable)
ctype = GIMP_BAD_CURSOR; ctype = GIMP_BAD_CURSOR;

6
app/tools/gimpsourcetool.c
View File

@ -205,7 +205,7 @@ gimp_clone_tool_button_press (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool); paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK) if ((state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
GIMP_CLONE (paint_tool->core)->set_source = TRUE; GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else else
GIMP_CLONE (paint_tool->core)->set_source = FALSE; GIMP_CLONE (paint_tool->core)->set_source = FALSE;
@ -225,7 +225,7 @@ gimp_clone_tool_motion (GimpTool *tool,
paint_tool = GIMP_PAINT_TOOL (tool); paint_tool = GIMP_PAINT_TOOL (tool);
if (state & GDK_CONTROL_MASK) if ((state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
GIMP_CLONE (paint_tool->core)->set_source = TRUE; GIMP_CLONE (paint_tool->core)->set_source = TRUE;
else else
GIMP_CLONE (paint_tool->core)->set_source = FALSE; GIMP_CLONE (paint_tool->core)->set_source = FALSE;
@ -259,7 +259,7 @@ gimp_clone_tool_cursor_update (GimpTool *tool,
if (options->clone_type == GIMP_IMAGE_CLONE) if (options->clone_type == GIMP_IMAGE_CLONE)
{ {
if (state & GDK_CONTROL_MASK) if ((state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) == GDK_CONTROL_MASK)
ctype = GIMP_CROSSHAIR_SMALL_CURSOR; ctype = GIMP_CROSSHAIR_SMALL_CURSOR;
else if (! GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable) else if (! GIMP_CLONE (GIMP_PAINT_TOOL (tool)->core)->src_drawable)
ctype = GIMP_BAD_CURSOR; ctype = GIMP_BAD_CURSOR;