[gimp] app: consistent handle sizes for tool drawing



commit cf0402f0691ed629419b59d18b85db210a91b948
Author: Michael Natterer <mitch gimp org>
Date:   Mon Nov 8 22:37:00 2010 +0100

    app: consistent handle sizes for tool drawing
    
    Replace a myriad of defines in different tools by three consistent
    sizes defined in gimpdrawtool.h.

 app/tools/gimpblendtool.c            |   11 ++++-------
 app/tools/gimpcagetool.c             |    8 +++-----
 app/tools/gimpdrawtool.h             |    5 +++++
 app/tools/gimpfreeselecttool.c       |    8 ++++----
 app/tools/gimpiscissorstool.c        |   31 +++++++++++++++++--------------
 app/tools/gimpmeasuretool.c          |   19 ++++++++++---------
 app/tools/gimppainttool.c            |   11 ++++-------
 app/tools/gimpperspectiveclonetool.c |   19 ++++++++++---------
 app/tools/gimpsourcetool.c           |    6 ++----
 app/tools/gimptransformtool.c        |   13 +++++++------
 app/tools/gimpvectortool.c           |   26 +++++++++++++++-----------
 11 files changed, 81 insertions(+), 76 deletions(-)
---
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index 675cb5f..74f580d 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -46,9 +46,6 @@
 #include "gimp-intl.h"
 
 
-#define TARGET_SIZE  15
-
-
 /*  local function prototypes  */
 
 static gboolean gimp_blend_tool_initialize        (GimpTool              *tool,
@@ -391,8 +388,8 @@ gimp_blend_tool_draw (GimpDrawTool *draw_tool)
                              GIMP_HANDLE_CROSS,
                              blend_tool->start_x,
                              blend_tool->start_y,
-                             TARGET_SIZE,
-                             TARGET_SIZE,
+                             GIMP_TOOL_HANDLE_SIZE_CROSS,
+                             GIMP_TOOL_HANDLE_SIZE_CROSS,
                              GIMP_HANDLE_ANCHOR_CENTER);
 
   /*  Draw end target  */
@@ -400,8 +397,8 @@ gimp_blend_tool_draw (GimpDrawTool *draw_tool)
                              GIMP_HANDLE_CROSS,
                              blend_tool->end_x,
                              blend_tool->end_y,
-                             TARGET_SIZE,
-                             TARGET_SIZE,
+                             GIMP_TOOL_HANDLE_SIZE_CROSS,
+                             GIMP_TOOL_HANDLE_SIZE_CROSS,
                              GIMP_HANDLE_ANCHOR_CENTER);
 }
 
diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c
index fd97acb..acadde9 100644
--- a/app/tools/gimpcagetool.c
+++ b/app/tools/gimpcagetool.c
@@ -57,9 +57,6 @@
 #include "gimp-intl.h"
 
 
-#define HANDLE_SIZE 25
-
-
 static void       gimp_cage_tool_finalize           (GObject               *object);
 static void       gimp_cage_tool_start              (GimpCageTool          *ct,
                                                      GimpDisplay           *display);
@@ -332,7 +329,7 @@ gimp_cage_tool_oper_update (GimpTool         *tool,
                                           options->cage_mode,
                                           coords->x,
                                           coords->y,
-                                          HANDLE_SIZE);
+                                          GIMP_TOOL_HANDLE_SIZE_CIRCLE);
 
   gimp_draw_tool_pause (draw_tool);
 
@@ -572,7 +569,8 @@ gimp_cage_tool_draw (GimpDrawTool *draw_tool)
                                  handle,
                                  x1 + ct->config->offset_x,
                                  y1 + ct->config->offset_y,
-                                 HANDLE_SIZE, HANDLE_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
     }
 }
diff --git a/app/tools/gimpdrawtool.h b/app/tools/gimpdrawtool.h
index 8a12f1d..a9ff570 100644
--- a/app/tools/gimpdrawtool.h
+++ b/app/tools/gimpdrawtool.h
@@ -22,6 +22,11 @@
 #include "gimptool.h"
 
 
+#define GIMP_TOOL_HANDLE_SIZE_CIRCLE 13
+#define GIMP_TOOL_HANDLE_SIZE_CROSS  15
+#define GIMP_TOOL_HANDLE_SIZE_LARGE  25
+
+
 #define GIMP_TYPE_DRAW_TOOL            (gimp_draw_tool_get_type ())
 #define GIMP_DRAW_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DRAW_TOOL, GimpDrawTool))
 #define GIMP_DRAW_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DRAW_TOOL, GimpDrawToolClass))
diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c
index 3fe41cd..37cdb13 100644
--- a/app/tools/gimpfreeselecttool.c
+++ b/app/tools/gimpfreeselecttool.c
@@ -49,9 +49,8 @@
 #include "gimp-intl.h"
 
 
-#define HANDLE_SIZE             13
-#define POINT_GRAB_THRESHOLD_SQ SQR(HANDLE_SIZE / 2)
-#define POINT_SHOW_THRESHOLD_SQ SQR(HANDLE_SIZE * 7)
+#define POINT_GRAB_THRESHOLD_SQ SQR (GIMP_TOOL_HANDLE_SIZE_CIRCLE / 2)
+#define POINT_SHOW_THRESHOLD_SQ SQR (GIMP_TOOL_HANDLE_SIZE_CIRCLE * 7)
 #define N_ITEMS_PER_ALLOC       1024
 #define INVALID_INDEX           (-1)
 #define NO_CLICK_TIME_AVAILABLE 0
@@ -1602,7 +1601,8 @@ gimp_free_select_tool_draw (GimpDrawTool *draw_tool)
             gimp_draw_tool_add_handle (draw_tool, handle_type,
                                        point->x,
                                        point->y,
-                                       HANDLE_SIZE, HANDLE_SIZE,
+                                       GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                       GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                        GIMP_HANDLE_ANCHOR_CENTER);
         }
     }
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index 53da202..9f079fc 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -85,8 +85,6 @@
 /*  defines  */
 #define  MAX_GRADIENT      179.606  /* == sqrt (127^2 + 127^2) */
 #define  GRADIENT_SEARCH   32  /* how far to look when snapping to an edge */
-#define  TARGET_SIZE       25
-#define  POINT_WIDTH       12  /* size (in pixels) of seed handles */
 #define  EXTEND_BY         0.2 /* proportion to expand cost map by */
 #define  FIXED             5   /* additional fixed size to expand cost map */
 #define  MIN_GRADIENT      63  /* gradients < this are directionless */
@@ -607,7 +605,8 @@ gimp_iscissors_tool_button_release (GimpTool              *tool,
                                                 iscissors->x, iscissors->y,
                                                 GIMP_HANDLE_CIRCLE,
                                                 curve->x1, curve->y1,
-                                                POINT_WIDTH, POINT_WIDTH,
+                                                GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                                GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                                 GIMP_HANDLE_ANCHOR_CENTER))
                     {
                       iscissors->x = curve->x1;
@@ -752,7 +751,8 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
       gimp_draw_tool_add_handle (draw_tool,
                                  GIMP_HANDLE_CROSS,
                                  iscissors->x, iscissors->y,
-                                 TARGET_SIZE, TARGET_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
 
       /* Draw a line boundary */
@@ -812,8 +812,8 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
                                      GIMP_HANDLE_FILLED_CIRCLE,
                                      iscissors->ix,
                                      iscissors->iy,
-                                     POINT_WIDTH,
-                                     POINT_WIDTH,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                      GIMP_HANDLE_ANCHOR_CENTER);
         }
 
@@ -835,8 +835,8 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
                                      GIMP_HANDLE_FILLED_CIRCLE,
                                      curve->x1,
                                      curve->y1,
-                                     POINT_WIDTH,
-                                     POINT_WIDTH,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                      GIMP_HANDLE_ANCHOR_CENTER);
 
           if (iscissors->draw & DRAW_ACTIVE_CURVE)
@@ -876,8 +876,8 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
                                  GIMP_HANDLE_FILLED_CIRCLE,
                                  iscissors->nx,
                                  iscissors->ny,
-                                 POINT_WIDTH,
-                                 POINT_WIDTH,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                 GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
     }
 }
@@ -943,7 +943,8 @@ gimp_iscissors_tool_oper_update (GimpTool         *tool,
                                     RINT (coords->x), RINT (coords->y),
                                     GIMP_HANDLE_CIRCLE,
                                     curve->x1, curve->y1,
-                                    POINT_WIDTH, POINT_WIDTH,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                     GIMP_HANDLE_ANCHOR_CENTER))
         {
           gimp_tool_replace_status (tool, display, _("Click to close the"
@@ -1214,7 +1215,8 @@ mouse_over_vertex (GimpIscissorsTool *iscissors,
                                     x, y,
                                     GIMP_HANDLE_CIRCLE,
                                     curve->x1, curve->y1,
-                                    POINT_WIDTH, POINT_WIDTH,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                     GIMP_HANDLE_ANCHOR_CENTER))
         {
           iscissors->curve1 = curve;
@@ -1227,7 +1229,8 @@ mouse_over_vertex (GimpIscissorsTool *iscissors,
                                          x, y,
                                          GIMP_HANDLE_CIRCLE,
                                          curve->x2, curve->y2,
-                                         POINT_WIDTH, POINT_WIDTH,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                          GIMP_HANDLE_ANCHOR_CENTER))
         {
           iscissors->curve2 = curve;
@@ -1303,7 +1306,7 @@ mouse_over_curve (GimpIscissorsTool *iscissors,
           if (gimp_draw_tool_calc_distance_square (GIMP_DRAW_TOOL (iscissors),
                                                    GIMP_TOOL (iscissors)->display,
                                                    tx, ty,
-                                                   x, y) < SQR (POINT_WIDTH / 2))
+                                                   x, y) < SQR (GIMP_TOOL_HANDLE_SIZE_CIRCLE / 2))
             {
               return list;
             }
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index 553c236..abe5cdf 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -55,8 +55,7 @@
 #include "gimp-intl.h"
 
 
-#define  TARGET      12
-#define  ARC_RADIUS  30
+#define ARC_RADIUS 30
 
 
 /*  local function prototypes  */
@@ -219,7 +218,8 @@ gimp_measure_tool_button_press (GimpTool            *tool,
                                         GIMP_HANDLE_CIRCLE,
                                         measure->x[i],
                                         measure->y[i],
-                                        TARGET * 2, TARGET * 2,
+                                        GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                        GIMP_TOOL_HANDLE_SIZE_CROSS,
                                         GIMP_HANDLE_ANCHOR_CENTER))
             {
               if (state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
@@ -546,7 +546,8 @@ gimp_measure_tool_cursor_update (GimpTool         *tool,
                                         GIMP_HANDLE_CIRCLE,
                                         measure->x[i],
                                         measure->y[i],
-                                        TARGET * 2, TARGET * 2,
+                                        GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                        GIMP_TOOL_HANDLE_SIZE_CROSS,
                                         GIMP_HANDLE_ANCHOR_CENTER))
             {
               in_handle = TRUE;
@@ -669,8 +670,8 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
                                      GIMP_HANDLE_CIRCLE,
                                      measure->x[i],
                                      measure->y[i],
-                                     TARGET,
-                                     TARGET,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
                                      GIMP_HANDLE_ANCHOR_CENTER);
         }
       else
@@ -679,8 +680,8 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
                                      GIMP_HANDLE_CROSS,
                                      measure->x[i],
                                      measure->y[i],
-                                     TARGET * 2,
-                                     TARGET * 2,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
                                      GIMP_HANDLE_ANCHOR_CENTER);
         }
 
@@ -744,7 +745,7 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
 
               shell = gimp_display_get_shell (tool->display);
 
-              target     = FUNSCALEX (shell, (TARGET >> 1));
+              target     = FUNSCALEX (shell, (GIMP_TOOL_HANDLE_SIZE_CROSS >> 1));
               arc_radius = FUNSCALEX (shell, ARC_RADIUS);
 
               gimp_draw_tool_add_line (draw_tool,
diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c
index fed8b26..e846594 100644
--- a/app/tools/gimppainttool.c
+++ b/app/tools/gimppainttool.c
@@ -51,9 +51,6 @@
 #include "gimp-intl.h"
 
 
-#define HANDLE_SIZE 15
-
-
 static GObject * gimp_paint_tool_constructor (GType                  type,
                                               guint                  n_params,
                                               GObjectConstructParam *params);
@@ -744,8 +741,8 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
                                      GIMP_HANDLE_CROSS,
                                      core->last_coords.x + off_x,
                                      core->last_coords.y + off_y,
-                                     HANDLE_SIZE,
-                                     HANDLE_SIZE,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
                                      GIMP_HANDLE_ANCHOR_CENTER);
 
           /*  Draw end target  */
@@ -753,8 +750,8 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
                                      GIMP_HANDLE_CROSS,
                                      core->cur_coords.x + off_x,
                                      core->cur_coords.y + off_y,
-                                     HANDLE_SIZE,
-                                     HANDLE_SIZE,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                     GIMP_TOOL_HANDLE_SIZE_CROSS,
                                      GIMP_HANDLE_ANCHOR_CENTER);
         }
     }
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
index 4a75b3b..d0622f0 100644
--- a/app/tools/gimpperspectiveclonetool.c
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -46,10 +46,6 @@
 #include "gimp-intl.h"
 
 
-#define HANDLE_SIZE  25
-#define TARGET_SIZE  15
-
-
 static GObject *     gimp_perspective_clone_tool_constructor   (GType                type,
                                                                 guint                n_params,
                                                                 GObjectConstructParam *params);
@@ -773,22 +769,26 @@ gimp_perspective_clone_tool_draw (GimpDrawTool *draw_tool)
       gimp_draw_tool_add_handle (draw_tool,
                                  GIMP_HANDLE_SQUARE,
                                  clone_tool->tx1, clone_tool->ty1,
-                                 HANDLE_SIZE, HANDLE_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
       gimp_draw_tool_add_handle (draw_tool,
                                  GIMP_HANDLE_SQUARE,
                                  clone_tool->tx2, clone_tool->ty2,
-                                 HANDLE_SIZE, HANDLE_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
       gimp_draw_tool_add_handle (draw_tool,
                                  GIMP_HANDLE_SQUARE,
                                  clone_tool->tx3, clone_tool->ty3,
-                                 HANDLE_SIZE, HANDLE_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
       gimp_draw_tool_add_handle (draw_tool,
                                  GIMP_HANDLE_SQUARE,
                                  clone_tool->tx4, clone_tool->ty4,
-                                 HANDLE_SIZE, HANDLE_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
+                                 GIMP_TOOL_HANDLE_SIZE_LARGE,
                                  GIMP_HANDLE_ANCHOR_CENTER);
     }
 
@@ -804,7 +804,8 @@ gimp_perspective_clone_tool_draw (GimpDrawTool *draw_tool)
                                  GIMP_HANDLE_CROSS,
                                  clone_tool->src_x,
                                  clone_tool->src_y,
-                                 TARGET_SIZE, TARGET_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSS,
                                  GIMP_HANDLE_ANCHOR_CENTER);
 
       draw_tool->display = tmp_display;
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index 7b3e9bb..cc4b599 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -39,9 +39,6 @@
 #include "gimp-intl.h"
 
 
-#define TARGET_SIZE  15
-
-
 static gboolean      gimp_source_tool_has_display   (GimpTool            *tool,
                                                      GimpDisplay         *display);
 static GimpDisplay * gimp_source_tool_has_image     (GimpTool            *tool,
@@ -386,7 +383,8 @@ gimp_source_tool_draw (GimpDrawTool *draw_tool)
                                  GIMP_HANDLE_CROSS,
                                  source_tool->src_x + off_x,
                                  source_tool->src_y + off_y,
-                                 TARGET_SIZE, TARGET_SIZE,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSS,
+                                 GIMP_TOOL_HANDLE_SIZE_CROSS,
                                  GIMP_HANDLE_ANCHOR_CENTER);
 
       draw_tool->display = tmp_display;
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index d0452ba..b42fb8f 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -67,8 +67,7 @@
 #include "gimp-intl.h"
 
 
-#define HANDLE_SIZE      25
-#define MIN_HANDLE_SIZE  6
+#define MIN_HANDLE_SIZE 6
 
 
 static GObject * gimp_transform_tool_constructor            (GType                  type,
@@ -224,8 +223,8 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
   tr_tool->use_center       = FALSE;
   tr_tool->use_mid_handles  = FALSE;
 
-  tr_tool->handle_w         = HANDLE_SIZE;
-  tr_tool->handle_h         = HANDLE_SIZE;
+  tr_tool->handle_w         = GIMP_TOOL_HANDLE_SIZE_LARGE;
+  tr_tool->handle_h         = GIMP_TOOL_HANDLE_SIZE_LARGE;
 
   tr_tool->ngx              = 0;
   tr_tool->ngy              = 0;
@@ -1665,8 +1664,10 @@ gimp_transform_tool_handles_recalc (GimpTransformTool *tr_tool,
   x2 = MAX (MAX (dx1, dx2), MAX (dx3, dx4));
   y2 = MAX (MAX (dy1, dy2), MAX (dy3, dy4));
 
-  tr_tool->handle_w = CLAMP ((x2 - x1) / 3, MIN_HANDLE_SIZE, HANDLE_SIZE);
-  tr_tool->handle_h = CLAMP ((y2 - y1) / 3, MIN_HANDLE_SIZE, HANDLE_SIZE);
+  tr_tool->handle_w = CLAMP ((x2 - x1) / 3,
+                             MIN_HANDLE_SIZE, GIMP_TOOL_HANDLE_SIZE_LARGE);
+  tr_tool->handle_h = CLAMP ((y2 - y1) / 3,
+                             MIN_HANDLE_SIZE, GIMP_TOOL_HANDLE_SIZE_LARGE);
 }
 
 static void
diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c
index 3d1e2d5..45f0431 100644
--- a/app/tools/gimpvectortool.c
+++ b/app/tools/gimpvectortool.c
@@ -62,8 +62,6 @@
 #include "gimp-intl.h"
 
 
-#define TARGET       13
-
 #define TOGGLE_MASK  GDK_SHIFT_MASK
 #define MOVE_MASK    GDK_MOD1_MASK
 #define INSDEL_MASK  GDK_CONTROL_MASK
@@ -302,7 +300,9 @@ gimp_vector_tool_button_press (GimpTool            *tool,
 
   if (vector_tool->function == VECTORS_SELECT_VECTOR)
     {
-      if (gimp_draw_tool_on_vectors (draw_tool, display, coords, TARGET, TARGET,
+      if (gimp_draw_tool_on_vectors (draw_tool, display, coords,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                     GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                      NULL, NULL, NULL, NULL, NULL, &vectors))
         {
           gimp_vector_tool_set_vectors (vector_tool, vectors);
@@ -435,7 +435,8 @@ gimp_vector_tool_button_press (GimpTool            *tool,
 
           gimp_draw_tool_on_vectors_handle (GIMP_DRAW_TOOL (tool), display,
                                             vector_tool->vectors, coords,
-                                            TARGET, TARGET,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                            GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                             GIMP_ANCHOR_CONTROL, TRUE,
                                             &vector_tool->cur_anchor,
                                             &vector_tool->cur_stroke);
@@ -960,7 +961,8 @@ gimp_vector_tool_oper_update (GimpTool         *tool,
                                                     display,
                                                     vector_tool->vectors,
                                                     coords,
-                                                    TARGET, TARGET,
+                                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                                     GIMP_ANCHOR_ANCHOR,
                                                     vector_tool->sel_count > 2,
                                                     &anchor, &stroke);
@@ -970,7 +972,8 @@ gimp_vector_tool_oper_update (GimpTool         *tool,
                                                     display,
                                                     vector_tool->vectors,
                                                     coords,
-                                                    TARGET, TARGET,
+                                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                                    GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                                     NULL,
                                                     &position, &anchor,
                                                     &anchor2, &stroke);
@@ -983,7 +986,8 @@ gimp_vector_tool_oper_update (GimpTool         *tool,
   else
     {
       on_vectors = gimp_draw_tool_on_vectors (draw_tool, display, coords,
-                                              TARGET, TARGET,
+                                              GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                              GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                               NULL, NULL, NULL, NULL, NULL,
                                               &(vector_tool->cur_vectors));
     }
@@ -1436,8 +1440,8 @@ gimp_vector_tool_draw (GimpDrawTool *draw_tool)
                                          GIMP_HANDLE_FILLED_CIRCLE,
                                          cur_anchor->position.x,
                                          cur_anchor->position.y,
-                                         TARGET,
-                                         TARGET,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE,
                                          GIMP_HANDLE_ANCHOR_CENTER);
             }
         }
@@ -1484,8 +1488,8 @@ gimp_vector_tool_draw (GimpDrawTool *draw_tool)
                                          GIMP_HANDLE_SQUARE,
                                          cur_anchor->position.x,
                                          cur_anchor->position.y,
-                                         TARGET - 3,
-                                         TARGET - 3,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE - 3,
+                                         GIMP_TOOL_HANDLE_SIZE_CIRCLE - 3,
                                          GIMP_HANDLE_ANCHOR_CENTER);
             }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]