Commit c0b1fcb9 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

cursors/Makefile.am cursors/gimp-tool-cursors.xcf

2005-08-18  Michael Natterer  <mitch@gimp.org>

	* cursors/Makefile.am
	* cursors/gimp-tool-cursors.xcf
	* cursors/modifier-join.png
	* cursors/xbm/modifier-join-mask.xbm
	* cursors/xbm/modifier-join.xbm: images for a "join" cursor modifier.

	* app/widgets/widgets-enums.h
	* app/widgets/gimpcursor.c: add the cursor.

	* app/tools/gimpvectortool.c: use it for connecting strokes.
	Fixes bug #313252.
parent b55111bf
2005-08-18 Michael Natterer <mitch@gimp.org>
* cursors/Makefile.am
* cursors/gimp-tool-cursors.xcf
* cursors/modifier-join.png
* cursors/xbm/modifier-join-mask.xbm
* cursors/xbm/modifier-join.xbm: images for a "join" cursor modifier.
* app/widgets/widgets-enums.h
* app/widgets/gimpcursor.c: add the cursor.
* app/tools/gimpvectortool.c: use it for connecting strokes.
Fixes bug #313252.
2005-08-18 Sven Neumann <sven@gimp.org>
* app/tools/gimpforegroundselecttool.c: removed reference to SIOX
......
......@@ -1328,7 +1328,7 @@ gimp_vector_tool_cursor_update (GimpTool *tool,
case VECTORS_CONNECT_STROKES:
tool_cursor = GIMP_TOOL_CURSOR_PATHS_SEGMENT;
cmodifier = GIMP_CURSOR_MODIFIER_PLUS;
cmodifier = GIMP_CURSOR_MODIFIER_JOIN;
break;
default:
......
......@@ -132,6 +132,8 @@
#include "cursors/xbm/modifier-background-mask.xbm"
#include "cursors/xbm/modifier-pattern.xbm"
#include "cursors/xbm/modifier-pattern-mask.xbm"
#include "cursors/xbm/modifier-join.xbm"
#include "cursors/xbm/modifier-join-mask.xbm"
typedef struct _GimpCursor GimpCursor;
......@@ -483,6 +485,12 @@ static GimpCursor gimp_cursor_modifiers[] =
modifier_pattern_width, modifier_pattern_height,
0, 0,
modifier_pattern, NULL, NULL, NULL
},
{
modifier_join_bits, modifier_join_mask_bits,
modifier_join_width, modifier_join_height,
0, 0,
modifier_join, NULL, NULL, NULL
}
};
......
......@@ -289,6 +289,7 @@ typedef enum /*< skip >*/
GIMP_CURSOR_MODIFIER_FOREGROUND,
GIMP_CURSOR_MODIFIER_BACKGROUND,
GIMP_CURSOR_MODIFIER_PATTERN,
GIMP_CURSOR_MODIFIER_JOIN,
GIMP_CURSOR_MODIFIER_LAST
} GimpCursorModifier;
......
......@@ -14,6 +14,7 @@ CURSOR_IMAGES = \
modifier-control.png \
modifier-foreground.png \
modifier-intersect.png \
modifier-join.png \
modifier-minus.png \
modifier-move.png \
modifier-pattern.png \
......@@ -95,6 +96,8 @@ EXTRA_DIST = \
xbm/modifier-background-mask.xbm \
xbm/modifier-pattern.xbm \
xbm/modifier-pattern-mask.xbm \
xbm/modifier-join.xbm \
xbm/modifier-join-mask.xbm \
\
xbm/tool-rect-select.xbm \
xbm/tool-rect-select-mask.xbm \
......
#define modifier_join_mask_width 32
#define modifier_join_mask_height 32
static unsigned char modifier_join_mask_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0e, 0x00, 0x00, 0xf0, 0x1f,
0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xdc, 0x77, 0x00, 0x00, 0xdc, 0x77,
0x00, 0x00, 0xdc, 0x77, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf0, 0x1f,
0x00, 0x00, 0xe0, 0x0e, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define modifier_join_width 32
#define modifier_join_height 32
static unsigned char modifier_join_bits[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0e,
0x00, 0x00, 0x10, 0x11, 0x00, 0x00, 0x88, 0x22, 0x00, 0x00, 0x88, 0x22,
0x00, 0x00, 0x88, 0x22, 0x00, 0x00, 0x10, 0x11, 0x00, 0x00, 0xe0, 0x0e,
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,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
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