Commit 85b1f160 authored by Michael Natterer's avatar Michael Natterer

app,cursors: add side and corner cursors in 45° steps

So sides also for corners and corners also for sides, just to
confuse the reader.
parent c6ba0ffb
......@@ -44,20 +44,36 @@
#define cursor_color_picker_y_hot 30
#define cursor_corner_top_left_x_hot 10
#define cursor_corner_top_left_y_hot 10
#define cursor_corner_top_x_hot 10
#define cursor_corner_top_y_hot 10
#define cursor_corner_top_right_x_hot 10
#define cursor_corner_top_right_y_hot 10
#define cursor_corner_left_x_hot 10
#define cursor_corner_left_y_hot 10
#define cursor_corner_right_x_hot 10
#define cursor_corner_right_y_hot 10
#define cursor_corner_bottom_left_x_hot 10
#define cursor_corner_bottom_left_y_hot 10
#define cursor_corner_bottom_x_hot 10
#define cursor_corner_bottom_y_hot 10
#define cursor_corner_bottom_right_x_hot 10
#define cursor_corner_bottom_right_y_hot 10
#define cursor_side_top_left_x_hot 10
#define cursor_side_top_left_y_hot 10
#define cursor_side_top_x_hot 10
#define cursor_side_top_y_hot 10
#define cursor_side_top_right_x_hot 10
#define cursor_side_top_right_y_hot 10
#define cursor_side_left_x_hot 10
#define cursor_side_left_y_hot 10
#define cursor_side_right_x_hot 10
#define cursor_side_right_y_hot 10
#define cursor_side_bottom_left_x_hot 10
#define cursor_side_bottom_left_y_hot 10
#define cursor_side_bottom_x_hot 10
#define cursor_side_bottom_y_hot 10
#define cursor_side_bottom_right_x_hot 10
#define cursor_side_bottom_right_y_hot 10
typedef struct _GimpCursor GimpCursor;
......@@ -111,22 +127,46 @@ static GimpCursor gimp_cursors[] =
cursor_corner_top_left,
cursor_corner_top_left_x_hot, cursor_corner_top_left_y_hot
},
{
cursor_corner_top,
cursor_corner_top_x_hot, cursor_corner_top_y_hot
},
{
cursor_corner_top_right,
cursor_corner_top_right_x_hot, cursor_corner_top_right_y_hot
},
{
cursor_corner_left,
cursor_corner_left_x_hot, cursor_corner_left_y_hot
},
{
cursor_corner_right,
cursor_corner_right_x_hot, cursor_corner_right_y_hot
},
{
cursor_corner_bottom_left,
cursor_corner_bottom_left_x_hot, cursor_corner_bottom_left_y_hot
},
{
cursor_corner_bottom,
cursor_corner_bottom_x_hot, cursor_corner_bottom_y_hot
},
{
cursor_corner_bottom_right,
cursor_corner_bottom_right_x_hot, cursor_corner_bottom_right_y_hot
},
{
cursor_side_top_left,
cursor_side_top_left_x_hot, cursor_side_top_left_y_hot
},
{
cursor_side_top,
cursor_side_top_x_hot, cursor_side_top_y_hot
},
{
cursor_side_top_right,
cursor_side_top_right_x_hot, cursor_side_top_right_y_hot
},
{
cursor_side_left,
cursor_side_left_x_hot, cursor_side_left_y_hot
......@@ -135,9 +175,17 @@ static GimpCursor gimp_cursors[] =
cursor_side_right,
cursor_side_right_x_hot, cursor_side_right_y_hot
},
{
cursor_side_bottom_left,
cursor_side_bottom_left_x_hot, cursor_side_bottom_left_y_hot
},
{
cursor_side_bottom,
cursor_side_bottom_x_hot, cursor_side_bottom_y_hot
},
{
cursor_side_bottom_right,
cursor_side_bottom_right_x_hot, cursor_side_bottom_right_y_hot
}
};
......@@ -278,6 +326,14 @@ gimp_cursor_new (GdkDisplay *display,
{
cursor_type = GIMP_CURSOR_CORNER_TOP_LEFT;
}
else if (cursor_type == GIMP_CURSOR_CORNER_LEFT)
{
cursor_type = GIMP_CURSOR_CORNER_RIGHT;
}
else if (cursor_type == GIMP_CURSOR_CORNER_RIGHT)
{
cursor_type = GIMP_CURSOR_CORNER_LEFT;
}
else if (cursor_type == GIMP_CURSOR_CORNER_BOTTOM_LEFT)
{
cursor_type = GIMP_CURSOR_CORNER_BOTTOM_RIGHT;
......@@ -286,6 +342,14 @@ gimp_cursor_new (GdkDisplay *display,
{
cursor_type = GIMP_CURSOR_CORNER_BOTTOM_LEFT;
}
else if (cursor_type == GIMP_CURSOR_SIDE_TOP_LEFT)
{
cursor_type = GIMP_CURSOR_SIDE_TOP_RIGHT;
}
else if (cursor_type == GIMP_CURSOR_SIDE_TOP_RIGHT)
{
cursor_type = GIMP_CURSOR_SIDE_TOP_LEFT;
}
else if (cursor_type == GIMP_CURSOR_SIDE_LEFT)
{
cursor_type = GIMP_CURSOR_SIDE_RIGHT;
......@@ -294,6 +358,14 @@ gimp_cursor_new (GdkDisplay *display,
{
cursor_type = GIMP_CURSOR_SIDE_LEFT;
}
else if (cursor_type == GIMP_CURSOR_SIDE_BOTTOM_LEFT)
{
cursor_type = GIMP_CURSOR_SIDE_BOTTOM_RIGHT;
}
else if (cursor_type == GIMP_CURSOR_SIDE_BOTTOM_RIGHT)
{
cursor_type = GIMP_CURSOR_SIDE_BOTTOM_LEFT;
}
}
/* prepare the main cursor */
......
......@@ -191,13 +191,21 @@ typedef enum /*< skip >*/
GIMP_CURSOR_ZOOM,
GIMP_CURSOR_COLOR_PICKER,
GIMP_CURSOR_CORNER_TOP_LEFT,
GIMP_CURSOR_CORNER_TOP,
GIMP_CURSOR_CORNER_TOP_RIGHT,
GIMP_CURSOR_CORNER_LEFT,
GIMP_CURSOR_CORNER_RIGHT,
GIMP_CURSOR_CORNER_BOTTOM_LEFT,
GIMP_CURSOR_CORNER_BOTTOM,
GIMP_CURSOR_CORNER_BOTTOM_RIGHT,
GIMP_CURSOR_SIDE_TOP_LEFT,
GIMP_CURSOR_SIDE_TOP,
GIMP_CURSOR_SIDE_TOP_RIGHT,
GIMP_CURSOR_SIDE_LEFT,
GIMP_CURSOR_SIDE_RIGHT,
GIMP_CURSOR_SIDE_BOTTOM_LEFT,
GIMP_CURSOR_SIDE_BOTTOM,
GIMP_CURSOR_SIDE_BOTTOM_RIGHT,
GIMP_CURSOR_LAST
} GimpCursorType;
......
......@@ -5,16 +5,24 @@ CURSOR_IMAGES = \
cursor-color-picker.png \
cursor-corner-bottom-left.png \
cursor-corner-bottom-right.png \
cursor-corner-bottom.png \
cursor-corner-left.png \
cursor-corner-right.png \
cursor-corner-top-left.png \
cursor-corner-top-right.png \
cursor-crosshair.png \
cursor-corner-top.png \
cursor-crosshair-small.png \
cursor-crosshair.png \
cursor-mouse.png \
cursor-move.png \
cursor-none.png \
cursor-side-bottom-left.png \
cursor-side-bottom-right.png \
cursor-side-bottom.png \
cursor-side-left.png \
cursor-side-right.png \
cursor-side-top-left.png \
cursor-side-top-right.png \
cursor-side-top.png \
cursor-zoom.png \
\
......
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