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

cursors/hand.xbm removed.

Browse Source 
2003-09-17  Michael Natterer  <mitch@gimp.org>

	* cursors/hand.xbm
	* cursors/hand_mask.xbm: removed.

	* cursors/hand_small.xbm
	* cursors/hand_small_mask.xbm: ...and added under new names.

	* cursors/Makefile.am
	* cursors/gimp-tool-cursors.xcf: changed accordingly.

	* app/widgets/widgets-enums.h
	* app/widgets/gimpcursor.c: removed HAND from the GimpCursorModifier
	enum and added it to the GimpToolCursorType enum. We don't have a
	hand tool but this way the hand cursor (which is in the lower
	right corner) can be used together with other cursor modifiers
	(which are in the upper right corner).

	* app/tools/gimpmovetool.c
	* app/tools/gimpvectortool.c: show cursor modifers with the hand
	cursor where appropriate.
This commit is contained in:
Michael Natterer
2003-09-17 10:42:26 +00:00
committed by Michael Natterer
parent 9c64fde3d1
commit f4942b7255
9 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ChangeLog
View File

@ -1,3 +1,25 @@
2003-09-17 Michael Natterer <mitch@gimp.org>
* cursors/hand.xbm
* cursors/hand_mask.xbm: removed.
* cursors/hand_small.xbm
* cursors/hand_small_mask.xbm: ...and added under new names.
* cursors/Makefile.am
* cursors/gimp-tool-cursors.xcf: changed accordingly.
* app/widgets/widgets-enums.h
* app/widgets/gimpcursor.c: removed HAND from the GimpCursorModifier
enum and added it to the GimpToolCursorType enum. We don't have a
hand tool but this way the hand cursor (which is in the lower
right corner) can be used together with other cursor modifiers
(which are in the upper right corner).
* app/tools/gimpmovetool.c
* app/tools/gimpvectortool.c: show cursor modifers with the hand
cursor where appropriate.
2003-09-16 Helvetix Victorinox <helvetix@gimp.org> 2003-09-16 Helvetix Victorinox <helvetix@gimp.org>
* app/composite/gimp-composite-{mmx,sse,sse2,altivec,vis}.c: Regenerated. * app/composite/gimp-composite-{mmx,sse,sse2,altivec,vis}.c: Regenerated.
@ -5,7 +27,8 @@
* app/composite/gimp-composite-regression.[ch]: Ensure all ints * app/composite/gimp-composite-regression.[ch]: Ensure all ints
are now unsigned longs. are now unsigned longs.
* app/composite/gimp-composite-sse2.c (gimp_composite_addition_rgba8_rgba8_rgba8_sse2): * app/composite/gimp-composite-sse2.c
(gimp_composite_addition_rgba8_rgba8_rgba8_sse2):
Enclosed the troublesome (rather dense) asm construct in Enclosed the troublesome (rather dense) asm construct in
__OPTIMIZE__ in which case the compiler can successfully __OPTIMIZE__ in which case the compiler can successfully
allocate enough registers to load up the asm() allocate enough registers to load up the asm()

18
app/tools/gimpmovetool.c
View File

@ -607,9 +607,9 @@ gimp_move_tool_cursor_update (GimpTool *tool,
NULL, NULL, NULL, NULL, NULL)) NULL, NULL, NULL, NULL, NULL))
{ {
gimp_tool_set_cursor (tool, gdisp, gimp_tool_set_cursor (tool, gdisp,
GIMP_MOUSE_CURSOR, GDK_HAND2,
GIMP_TOOL_CURSOR_NONE, GIMP_HAND_TOOL_CURSOR,
GIMP_CURSOR_MODIFIER_HAND); GIMP_CURSOR_MODIFIER_MOVE);
} }
else else
{ {
@ -661,8 +661,8 @@ gimp_move_tool_cursor_update (GimpTool *tool,
{ {
gimp_tool_set_cursor (tool, gdisp, gimp_tool_set_cursor (tool, gdisp,
GDK_HAND2, GDK_HAND2,
GIMP_TOOL_CURSOR_NONE, GIMP_HAND_TOOL_CURSOR,
GIMP_CURSOR_MODIFIER_HAND); GIMP_CURSOR_MODIFIER_MOVE);
if (! gimp_tool_control_is_active (tool->control)) if (! gimp_tool_control_is_active (tool->control))
{ {
@ -714,8 +714,8 @@ gimp_move_tool_cursor_update (GimpTool *tool,
{ {
gimp_tool_set_cursor (tool, gdisp, gimp_tool_set_cursor (tool, gdisp,
GDK_HAND2, GDK_HAND2,
GIMP_TOOL_CURSOR_NONE, GIMP_HAND_TOOL_CURSOR,
GIMP_CURSOR_MODIFIER_HAND); GIMP_CURSOR_MODIFIER_MOVE);
} }
} }
else else
@ -809,8 +809,8 @@ gimp_move_tool_start_guide (GimpTool *tool,
gimp_tool_set_cursor (tool, gdisp, gimp_tool_set_cursor (tool, gdisp,
GDK_HAND2, GDK_HAND2,
GIMP_TOOL_CURSOR_NONE, GIMP_HAND_TOOL_CURSOR,
GIMP_CURSOR_MODIFIER_HAND); GIMP_CURSOR_MODIFIER_MOVE);
gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp); gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);
} }

9
app/tools/gimpvectortool.c
View File

@ -940,8 +940,8 @@ gimp_vector_tool_cursor_update (GimpTool *tool,
switch (vector_tool->function) switch (vector_tool->function)
{ {
case VECTORS_SELECT_VECTOR: case VECTORS_SELECT_VECTOR:
tool_cursor = GIMP_TOOL_CURSOR_NONE; cursor = GDK_HAND2;
cmodifier = GIMP_CURSOR_MODIFIER_HAND; tool_cursor = GIMP_HAND_TOOL_CURSOR;
break; break;
case VECTORS_CREATE_VECTOR: case VECTORS_CREATE_VECTOR:
case VECTORS_CREATE_STROKE: case VECTORS_CREATE_STROKE:
@ -957,8 +957,9 @@ gimp_vector_tool_cursor_update (GimpTool *tool,
break; break;
case VECTORS_MOVE_HANDLE: case VECTORS_MOVE_HANDLE:
case VECTORS_CONVERT_EDGE: case VECTORS_CONVERT_EDGE:
tool_cursor = GIMP_TOOL_CURSOR_NONE; cursor = GDK_HAND2;
cmodifier = GIMP_CURSOR_MODIFIER_HAND; tool_cursor = GIMP_HAND_TOOL_CURSOR;
cmodifier = GIMP_CURSOR_MODIFIER_CONTROL;
break; break;
case VECTORS_MOVE_ANCHOR: case VECTORS_MOVE_ANCHOR:
case VECTORS_MOVE_CURVE: case VECTORS_MOVE_CURVE:

14
app/widgets/gimpcursor.c
View File

@ -99,6 +99,8 @@
#include "cursors/smudge_small_mask.xbm" #include "cursors/smudge_small_mask.xbm"
#include "cursors/measure_small.xbm" #include "cursors/measure_small.xbm"
#include "cursors/measure_small_mask.xbm" #include "cursors/measure_small_mask.xbm"
#include "cursors/hand_small.xbm"
#include "cursors/hand_small_mask.xbm"
/* modifiers */ /* modifiers */
#include "cursors/plus.xbm" #include "cursors/plus.xbm"
@ -121,8 +123,6 @@
#include "cursors/background_mask.xbm" #include "cursors/background_mask.xbm"
#include "cursors/pattern.xbm" #include "cursors/pattern.xbm"
#include "cursors/pattern_mask.xbm" #include "cursors/pattern_mask.xbm"
#include "cursors/hand.xbm"
#include "cursors/hand_mask.xbm"
typedef struct _GimpBitmapCursor GimpBitmapCursor; typedef struct _GimpBitmapCursor GimpBitmapCursor;
@ -333,6 +333,11 @@ static GimpBitmapCursor gimp_stock_tool_cursors[] =
measure_small_bits, measure_small_mask_bits, measure_small_bits, measure_small_mask_bits,
measure_small_width, measure_small_height, measure_small_width, measure_small_height,
0, 0, NULL, NULL 0, 0, NULL, NULL
},
{
hand_small_bits, hand_small_mask_bits,
hand_small_width, hand_small_height,
hand_small_x_hot, hand_small_y_hot, NULL, NULL
} }
}; };
@ -394,11 +399,6 @@ static GimpBitmapCursor gimp_modifier_cursors[] =
pattern_bits, pattern_mask_bits, pattern_bits, pattern_mask_bits,
pattern_width, pattern_height, pattern_width, pattern_height,
pattern_x_hot, pattern_y_hot, NULL, NULL pattern_x_hot, pattern_y_hot, NULL, NULL
},
{
hand_bits, hand_mask_bits,
hand_width, hand_height,
hand_x_hot, hand_y_hot, NULL, NULL
} }
}; };

2
app/widgets/widgets-enums.h
View File

@ -158,6 +158,7 @@ typedef enum /*< skip >*/
GIMP_DODGE_TOOL_CURSOR, GIMP_DODGE_TOOL_CURSOR,
GIMP_BURN_TOOL_CURSOR, GIMP_BURN_TOOL_CURSOR,
GIMP_MEASURE_TOOL_CURSOR, GIMP_MEASURE_TOOL_CURSOR,
GIMP_HAND_TOOL_CURSOR,
GIMP_LAST_STOCK_TOOL_CURSOR_ENTRY GIMP_LAST_STOCK_TOOL_CURSOR_ENTRY
} GimpToolCursorType; } GimpToolCursorType;
@ -174,7 +175,6 @@ typedef enum /*< skip >*/
GIMP_CURSOR_MODIFIER_FOREGROUND, GIMP_CURSOR_MODIFIER_FOREGROUND,
GIMP_CURSOR_MODIFIER_BACKGROUND, GIMP_CURSOR_MODIFIER_BACKGROUND,
GIMP_CURSOR_MODIFIER_PATTERN, GIMP_CURSOR_MODIFIER_PATTERN,
GIMP_CURSOR_MODIFIER_HAND,
GIMP_LAST_CURSOR_MODIFIER_ENTRY GIMP_LAST_CURSOR_MODIFIER_ENTRY
} GimpCursorModifier; } GimpCursorModifier;

6
cursors/Makefile.am
View File

@ -34,8 +34,6 @@ EXTRA_DIST = \
background_mask.xbm \ background_mask.xbm \
pattern.xbm \ pattern.xbm \
pattern_mask.xbm \ pattern_mask.xbm \
hand.xbm \
hand_mask.xbm \
\ \
rect_select_small.xbm \ rect_select_small.xbm \
rect_select_small_mask.xbm \ rect_select_small_mask.xbm \
@ -96,4 +94,6 @@ EXTRA_DIST = \
smudge_small.xbm \ smudge_small.xbm \
smudge_small_mask.xbm \ smudge_small_mask.xbm \
measure_small.xbm \ measure_small.xbm \
measure_small_mask.xbm measure_small_mask.xbm \
hand_small.xbm \
hand_small_mask.xbm

BIN
cursors/gimp-tool-cursors.xcf
View File

Binary file not shown.

10
cursors/hand.xbm → cursors/hand_small.xbm
View File

@ -1,9 +1,9 @@
/* Created with The GIMP */ /* Created with The GIMP */
#define hand_width 32 #define hand_small_width 32
#define hand_height 32 #define hand_small_height 32
#define hand_x_hot 0 #define hand_small_x_hot 0
#define hand_y_hot 0 #define hand_small_y_hot 0
static unsigned char hand_bits[] = { static unsigned char hand_small_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

10
cursors/hand_mask.xbm → cursors/hand_small_mask.xbm
View File

@ -1,9 +1,9 @@
/* Created with The GIMP */ /* Created with The GIMP */
#define hand_mask_width 32 #define hand_small_mask_width 32
#define hand_mask_height 32 #define hand_small_mask_height 32
#define hand_mask_x_hot 0 #define hand_small_mask_x_hot 0
#define hand_mask_y_hot 0 #define hand_small_mask_y_hot 0
static unsigned char hand_mask_bits[] = { static unsigned char hand_small_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,