GNOME.org
 

=?utf-8?q?=5Bgimp/metadata-browser=5D_app=2Ccursors=3A_add_side_and_corne?= =?utf-8?q?r_cursors_in_45=C2=B0_steps?=

commit 7bf6ecdc0fd2d475ccee8b82cf28fbfd2262cedf
Author: Michael Natterer <mitch gimp org>
Date:   Sun Aug 26 23:59:05 2012 +0200

    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.

 app/widgets/gimpcursor.c             |   72 ++++++++++++++++++++++++++++++++++
 app/widgets/widgets-enums.h          |    8 ++++
 cursors/Makefile.am                  |   10 ++++-
 cursors/cursor-corner-bottom.png     |  Bin 0 -> 190 bytes
 cursors/cursor-corner-left.png       |  Bin 0 -> 187 bytes
 cursors/cursor-corner-right.png      |  Bin 0 -> 182 bytes
 cursors/cursor-corner-top.png        |  Bin 0 -> 193 bytes
 cursors/cursor-side-bottom-left.png  |  Bin 0 -> 264 bytes
 cursors/cursor-side-bottom-right.png |  Bin 0 -> 264 bytes
 cursors/cursor-side-top-left.png     |  Bin 0 -> 245 bytes
 cursors/cursor-side-top-right.png    |  Bin 0 -> 250 bytes
 cursors/gimp-tool-cursors.xcf        |  Bin 64376 -> 73399 bytes
 12 files changed, 89 insertions(+), 1 deletions(-)
---
diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
index f09dcd3..eb7b4ea 100644
--- a/app/widgets/gimpcursor.c
+++ b/app/widgets/gimpcursor.c
@@ -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;
@@ -112,22 +128,46 @@ static GimpCursor gimp_cursors[] =
     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
   },
@@ -136,8 +176,16 @@ static GimpCursor gimp_cursors[] =
     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  */
diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h
index ae8f5ae..48e1cae 100644
--- a/app/widgets/widgets-enums.h
+++ b/app/widgets/widgets-enums.h
@@ -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;
 
diff --git a/cursors/Makefile.am b/cursors/Makefile.am
index 262a216..577b77e 100644
--- a/cursors/Makefile.am
+++ b/cursors/Makefile.am
@@ -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				\
 	\
diff --git a/cursors/cursor-corner-bottom.png b/cursors/cursor-corner-bottom.png
new file mode 100644
index 0000000..60faf18
Binary files /dev/null and b/cursors/cursor-corner-bottom.png differ
diff --git a/cursors/cursor-corner-left.png b/cursors/cursor-corner-left.png
new file mode 100644
index 0000000..443fa51
Binary files /dev/null and b/cursors/cursor-corner-left.png differ
diff --git a/cursors/cursor-corner-right.png b/cursors/cursor-corner-right.png
new file mode 100644
index 0000000..d8e7062
Binary files /dev/null and b/cursors/cursor-corner-right.png differ
diff --git a/cursors/cursor-corner-top.png b/cursors/cursor-corner-top.png
new file mode 100644
index 0000000..e38e6c8
Binary files /dev/null and b/cursors/cursor-corner-top.png differ
diff --git a/cursors/cursor-side-bottom-left.png b/cursors/cursor-side-bottom-left.png
new file mode 100644
index 0000000..59312ec
Binary files /dev/null and b/cursors/cursor-side-bottom-left.png differ
diff --git a/cursors/cursor-side-bottom-right.png b/cursors/cursor-side-bottom-right.png
new file mode 100644
index 0000000..9a12943
Binary files /dev/null and b/cursors/cursor-side-bottom-right.png differ
diff --git a/cursors/cursor-side-top-left.png b/cursors/cursor-side-top-left.png
new file mode 100644
index 0000000..fb9d486
Binary files /dev/null and b/cursors/cursor-side-top-left.png differ
diff --git a/cursors/cursor-side-top-right.png b/cursors/cursor-side-top-right.png
new file mode 100644
index 0000000..4991ca7
Binary files /dev/null and b/cursors/cursor-side-top-right.png differ
diff --git a/cursors/gimp-tool-cursors.xcf b/cursors/gimp-tool-cursors.xcf
index 127d63c..1c4bc63 100644
Binary files a/cursors/gimp-tool-cursors.xcf and b/cursors/gimp-tool-cursors.xcf differ
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]