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

app: add #defines of standard handle sizes to gimpcanvashandle.h

Browse Source 
The same values as in gimpdrawtool.h, tool widgets in display/ must
not include the draw tool header from tools/.
This commit is contained in:
Michael Natterer
2017-06-19 10:46:05 +02:00
parent f5a6c859d7
commit b1dddcdc8f
4 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/display/gimpcanvashandle.h
View File

@ -25,6 +25,13 @@
#include "gimpcanvasitem.h" #include "gimpcanvasitem.h"
#define GIMP_CANVAS_HANDLE_SIZE_CIRCLE 13
#define GIMP_CANVAS_HANDLE_SIZE_CROSS 15
#define GIMP_CANVAS_HANDLE_SIZE_CROSSHAIR 43
#define GIMP_CANVAS_HANDLE_SIZE_LARGE 25
#define GIMP_CANVAS_HANDLE_SIZE_SMALL 7
#define GIMP_TYPE_CANVAS_HANDLE (gimp_canvas_handle_get_type ()) #define GIMP_TYPE_CANVAS_HANDLE (gimp_canvas_handle_get_type ())
#define GIMP_CANVAS_HANDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandle)) #define GIMP_CANVAS_HANDLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandle))
#define GIMP_CANVAS_HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandleClass)) #define GIMP_CANVAS_HANDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CANVAS_HANDLE, GimpCanvasHandleClass))

41
app/display/gimptoolcompass.c
View File

@ -47,9 +47,6 @@
#include "gimp-intl.h" #include "gimp-intl.h"
#define GIMP_TOOL_HANDLE_SIZE_CROSS 15 /* FIXME */
#define ARC_RADIUS 30 #define ARC_RADIUS 30
/* possible measure functions */ /* possible measure functions */
@ -322,6 +319,7 @@ gimp_tool_compass_constructed (GObject *object)
GimpToolWidget *widget = GIMP_TOOL_WIDGET (object); GimpToolWidget *widget = GIMP_TOOL_WIDGET (object);
GimpToolCompassPrivate *private = compass->private; GimpToolCompassPrivate *private = compass->private;
GimpCanvasGroup *stroke_group; GimpCanvasGroup *stroke_group;
gint i;
G_OBJECT_CLASS (parent_class)->constructed (object); G_OBJECT_CLASS (parent_class)->constructed (object);
@ -357,29 +355,18 @@ gimp_tool_compass_constructed (GObject *object)
gimp_tool_widget_pop_group (widget); gimp_tool_widget_pop_group (widget);
private->handles[0] = gimp_tool_widget_add_handle (widget, for (i = 0; i < 3; i++)
GIMP_HANDLE_CIRCLE, {
private->x[0], private->handles[i] =
private->y[0], gimp_tool_widget_add_handle (widget,
GIMP_TOOL_HANDLE_SIZE_CROSS, i == 0 ?
GIMP_TOOL_HANDLE_SIZE_CROSS, GIMP_HANDLE_CIRCLE : GIMP_HANDLE_CROSS,
GIMP_HANDLE_ANCHOR_CENTER); private->x[i],
private->y[i],
private->handles[1] = gimp_tool_widget_add_handle (widget, GIMP_CANVAS_HANDLE_SIZE_CROSS,
GIMP_HANDLE_CROSS, GIMP_CANVAS_HANDLE_SIZE_CROSS,
private->x[1], GIMP_HANDLE_ANCHOR_CENTER);
private->y[1], }
GIMP_TOOL_HANDLE_SIZE_CROSS,
GIMP_TOOL_HANDLE_SIZE_CROSS,
GIMP_HANDLE_ANCHOR_CENTER);
private->handles[2] = gimp_tool_widget_add_handle (widget,
GIMP_HANDLE_CROSS,
private->x[2],
private->y[2],
GIMP_TOOL_HANDLE_SIZE_CROSS,
GIMP_TOOL_HANDLE_SIZE_CROSS,
GIMP_HANDLE_ANCHOR_CENTER);
gimp_tool_compass_changed (widget); gimp_tool_compass_changed (widget);
} }
@ -525,7 +512,7 @@ gimp_tool_compass_changed (GimpToolWidget *widget)
draw_arc == private->n_points - 1 && draw_arc == private->n_points - 1 &&
angle2 != 0.0); angle2 != 0.0);
target = FUNSCALEX (shell, (GIMP_TOOL_HANDLE_SIZE_CROSS >> 1)); target = FUNSCALEX (shell, (GIMP_CANVAS_HANDLE_SIZE_CROSS >> 1));
arc_radius = FUNSCALEX (shell, ARC_RADIUS); arc_radius = FUNSCALEX (shell, ARC_RADIUS);
gimp_canvas_line_set (private->angle_line, gimp_canvas_line_set (private->angle_line,

11
app/display/gimptoolhandlegrid.c
View File

@ -40,9 +40,6 @@
#include "gimp-intl.h" #include "gimp-intl.h"
#define GIMP_TOOL_HANDLE_SIZE_CIRCLE 13
enum enum
{ {
PROP_0, PROP_0,
@ -359,8 +356,8 @@ gimp_tool_handle_grid_constructed (GObject *object)
gimp_tool_widget_add_handle (widget, gimp_tool_widget_add_handle (widget,
GIMP_HANDLE_CIRCLE, GIMP_HANDLE_CIRCLE,
0, 0, 0, 0,
GIMP_TOOL_HANDLE_SIZE_CIRCLE, GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
GIMP_TOOL_HANDLE_SIZE_CIRCLE, GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
GIMP_HANDLE_ANCHOR_CENTER); GIMP_HANDLE_ANCHOR_CENTER);
} }
@ -900,7 +897,7 @@ gimp_tool_handle_grid_get_cursor (GimpToolWidget *widget,
static gint static gint
calc_handle_diameter (gdouble distance) calc_handle_diameter (gdouble distance)
{ {
#define HANDLE_DIAMETER (2 * GIMP_TOOL_HANDLE_SIZE_CIRCLE) #define HANDLE_DIAMETER (2 * GIMP_CANVAS_HANDLE_SIZE_CIRCLE)
#define POINT_GRAB_THRESHOLD_SQ (SQR (HANDLE_DIAMETER / 2)) #define POINT_GRAB_THRESHOLD_SQ (SQR (HANDLE_DIAMETER / 2))
#define FULL_HANDLE_THRESHOLD_SQ (POINT_GRAB_THRESHOLD_SQ * 9) #define FULL_HANDLE_THRESHOLD_SQ (POINT_GRAB_THRESHOLD_SQ * 9)
#define PARTIAL_HANDLE_THRESHOLD_SQ (FULL_HANDLE_THRESHOLD_SQ * 5) #define PARTIAL_HANDLE_THRESHOLD_SQ (FULL_HANDLE_THRESHOLD_SQ * 5)
@ -913,7 +910,7 @@ calc_handle_diameter (gdouble distance)
size = CLAMP (size, 0.0, 1.0); size = CLAMP (size, 0.0, 1.0);
return (gint) CLAMP ((size * HANDLE_DIAMETER), return (gint) CLAMP ((size * HANDLE_DIAMETER),
GIMP_TOOL_HANDLE_SIZE_CIRCLE, GIMP_CANVAS_HANDLE_SIZE_CIRCLE,
HANDLE_DIAMETER); HANDLE_DIAMETER);
} }

5
app/display/gimptooltransformgrid.c
View File

@ -43,7 +43,6 @@
#define MIN_HANDLE_SIZE 6 #define MIN_HANDLE_SIZE 6
#define GIMP_TOOL_HANDLE_SIZE_LARGE 25 /* FIXME */
enum enum
@ -2212,9 +2211,9 @@ gimp_tool_transform_grid_calc_handles (GimpToolTransformGrid *grid,
y2 = MAX4 (dy1, dy2, dy3, dy4); y2 = MAX4 (dy1, dy2, dy3, dy4);
*handle_w = CLAMP ((x2 - x1) / 3, *handle_w = CLAMP ((x2 - x1) / 3,
MIN_HANDLE_SIZE, GIMP_TOOL_HANDLE_SIZE_LARGE); MIN_HANDLE_SIZE, GIMP_CANVAS_HANDLE_SIZE_LARGE);
*handle_h = CLAMP ((y2 - y1) / 3, *handle_h = CLAMP ((y2 - y1) / 3,
MIN_HANDLE_SIZE, GIMP_TOOL_HANDLE_SIZE_LARGE); MIN_HANDLE_SIZE, GIMP_CANVAS_HANDLE_SIZE_LARGE);
} }