mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-20 19:43:01 +00:00
app: fix incomplete earlier s/GtkAnchorType/GimpHandleAnchor/ change
This commit is contained in:
parent
479082075b
commit
22db39afd2
|
@ -246,13 +246,13 @@ gimp_canvas_handle_get_property (GObject *object,
|
|||
}
|
||||
|
||||
static inline void
|
||||
gimp_canvas_handle_shift_to_north_west (GtkAnchorType anchor,
|
||||
gdouble x,
|
||||
gdouble y,
|
||||
gint handle_width,
|
||||
gint handle_height,
|
||||
gdouble *shifted_x,
|
||||
gdouble *shifted_y)
|
||||
gimp_canvas_handle_shift_to_north_west (GimpHandleAnchor anchor,
|
||||
gdouble x,
|
||||
gdouble y,
|
||||
gint handle_width,
|
||||
gint handle_height,
|
||||
gdouble *shifted_x,
|
||||
gdouble *shifted_y)
|
||||
{
|
||||
switch (anchor)
|
||||
{
|
||||
|
@ -308,13 +308,13 @@ gimp_canvas_handle_shift_to_north_west (GtkAnchorType anchor,
|
|||
}
|
||||
|
||||
static inline void
|
||||
gimp_canvas_handle_shift_to_center (GtkAnchorType anchor,
|
||||
gdouble x,
|
||||
gdouble y,
|
||||
gint width,
|
||||
gint height,
|
||||
gdouble *shifted_x,
|
||||
gdouble *shifted_y)
|
||||
gimp_canvas_handle_shift_to_center (GimpHandleAnchor anchor,
|
||||
gdouble x,
|
||||
gdouble y,
|
||||
gint width,
|
||||
gint height,
|
||||
gdouble *shifted_x,
|
||||
gdouble *shifted_y)
|
||||
{
|
||||
switch (anchor)
|
||||
{
|
||||
|
|
|
@ -697,16 +697,16 @@ gimp_align_tool_draw (GimpDrawTool *draw_tool)
|
|||
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
x, y, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_NORTH_WEST);
|
||||
GIMP_HANDLE_ANCHOR_NORTH_WEST);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
x + w, y, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_NORTH_EAST);
|
||||
GIMP_HANDLE_ANCHOR_NORTH_EAST);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
x, y + h, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_SOUTH_WEST);
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_WEST);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
x + w, y + h, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_SOUTH_EAST);
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_EAST);
|
||||
}
|
||||
else if (GIMP_IS_GUIDE (list->data))
|
||||
{
|
||||
|
@ -722,10 +722,10 @@ gimp_align_tool_draw (GimpDrawTool *draw_tool)
|
|||
h = gimp_image_get_height (image);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
x, h, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_SOUTH);
|
||||
GIMP_HANDLE_ANCHOR_SOUTH);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
x, 0, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_NORTH);
|
||||
GIMP_HANDLE_ANCHOR_NORTH);
|
||||
break;
|
||||
|
||||
case GIMP_ORIENTATION_HORIZONTAL:
|
||||
|
@ -733,10 +733,10 @@ gimp_align_tool_draw (GimpDrawTool *draw_tool)
|
|||
w = gimp_image_get_width (image);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
w, y, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_EAST);
|
||||
GIMP_HANDLE_ANCHOR_EAST);
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_FILLED_SQUARE,
|
||||
0, y, MARKER_WIDTH, MARKER_WIDTH,
|
||||
GTK_ANCHOR_WEST);
|
||||
GIMP_HANDLE_ANCHOR_WEST);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -393,7 +393,7 @@ gimp_blend_tool_draw (GimpDrawTool *draw_tool)
|
|||
blend_tool->start_y,
|
||||
TARGET_SIZE,
|
||||
TARGET_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
/* Draw end target */
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
|
@ -402,7 +402,7 @@ gimp_blend_tool_draw (GimpDrawTool *draw_tool)
|
|||
blend_tool->end_y,
|
||||
TARGET_SIZE,
|
||||
TARGET_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -345,7 +345,7 @@ gimp_brush_tool_draw_brush (GimpBrushTool *brush_tool,
|
|||
{
|
||||
gimp_draw_tool_add_handle (draw_tool, GIMP_HANDLE_CROSS,
|
||||
x, y,
|
||||
5, 5, GTK_ANCHOR_CENTER);
|
||||
5, 5, GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -977,7 +977,7 @@ gimp_edit_selection_tool_draw (GimpDrawTool *draw_tool)
|
|||
edit_select->center_y + edit_select->cumly,
|
||||
CENTER_CROSS_SIZE,
|
||||
CENTER_CROSS_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
GIMP_DRAW_TOOL_CLASS (parent_class)->draw (draw_tool);
|
||||
}
|
||||
|
|
|
@ -1603,7 +1603,7 @@ gimp_free_select_tool_draw (GimpDrawTool *draw_tool)
|
|||
point->x,
|
||||
point->y,
|
||||
HANDLE_SIZE, HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -608,7 +608,7 @@ gimp_iscissors_tool_button_release (GimpTool *tool,
|
|||
GIMP_HANDLE_CIRCLE,
|
||||
curve->x1, curve->y1,
|
||||
POINT_WIDTH, POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
iscissors->x = curve->x1;
|
||||
iscissors->y = curve->y1;
|
||||
|
@ -753,7 +753,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_CROSS,
|
||||
iscissors->x, iscissors->y,
|
||||
TARGET_SIZE, TARGET_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
/* Draw a line boundary */
|
||||
if (! iscissors->first_point && ! (iscissors->draw & DRAW_LIVEWIRE))
|
||||
|
@ -814,7 +814,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
|
|||
iscissors->iy,
|
||||
POINT_WIDTH,
|
||||
POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
|
||||
/* Go through the list of icurves, and render each one... */
|
||||
|
@ -837,7 +837,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
|
|||
curve->y1,
|
||||
POINT_WIDTH,
|
||||
POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
if (iscissors->draw & DRAW_ACTIVE_CURVE)
|
||||
{
|
||||
|
@ -878,7 +878,7 @@ gimp_iscissors_tool_draw (GimpDrawTool *draw_tool)
|
|||
iscissors->ny,
|
||||
POINT_WIDTH,
|
||||
POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -944,7 +944,7 @@ gimp_iscissors_tool_oper_update (GimpTool *tool,
|
|||
GIMP_HANDLE_CIRCLE,
|
||||
curve->x1, curve->y1,
|
||||
POINT_WIDTH, POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
gimp_tool_replace_status (tool, display, _("Click to close the"
|
||||
" curve"));
|
||||
|
@ -1215,7 +1215,7 @@ mouse_over_vertex (GimpIscissorsTool *iscissors,
|
|||
GIMP_HANDLE_CIRCLE,
|
||||
curve->x1, curve->y1,
|
||||
POINT_WIDTH, POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
iscissors->curve1 = curve;
|
||||
|
||||
|
@ -1228,7 +1228,7 @@ mouse_over_vertex (GimpIscissorsTool *iscissors,
|
|||
GIMP_HANDLE_CIRCLE,
|
||||
curve->x2, curve->y2,
|
||||
POINT_WIDTH, POINT_WIDTH,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
iscissors->curve2 = curve;
|
||||
|
||||
|
|
|
@ -220,7 +220,7 @@ gimp_measure_tool_button_press (GimpTool *tool,
|
|||
measure->x[i],
|
||||
measure->y[i],
|
||||
TARGET * 2, TARGET * 2,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
if (state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
|
||||
{
|
||||
|
@ -547,7 +547,7 @@ gimp_measure_tool_cursor_update (GimpTool *tool,
|
|||
measure->x[i],
|
||||
measure->y[i],
|
||||
TARGET * 2, TARGET * 2,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
in_handle = TRUE;
|
||||
|
||||
|
@ -671,7 +671,7 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
|
|||
measure->y[i],
|
||||
TARGET,
|
||||
TARGET,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -681,7 +681,7 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
|
|||
measure->y[i],
|
||||
TARGET * 2,
|
||||
TARGET * 2,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
|
||||
if (i > 0)
|
||||
|
@ -731,7 +731,7 @@ gimp_measure_tool_draw (GimpDrawTool *draw_tool)
|
|||
measure->y[0],
|
||||
ARC_RADIUS * 2 + 1,
|
||||
ARC_RADIUS * 2 + 1,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
gimp_canvas_handle_set_angles (GIMP_CANVAS_HANDLE (item),
|
||||
angle1, angle2);
|
||||
|
|
|
@ -746,7 +746,7 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
|
|||
core->last_coords.y + off_y,
|
||||
HANDLE_SIZE,
|
||||
HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
/* Draw end target */
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
|
@ -755,7 +755,7 @@ gimp_paint_tool_draw (GimpDrawTool *draw_tool)
|
|||
core->cur_coords.y + off_y,
|
||||
HANDLE_SIZE,
|
||||
HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -774,22 +774,22 @@ gimp_perspective_clone_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_SQUARE,
|
||||
clone_tool->tx1, clone_tool->ty1,
|
||||
HANDLE_SIZE, HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_SQUARE,
|
||||
clone_tool->tx2, clone_tool->ty2,
|
||||
HANDLE_SIZE, HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_SQUARE,
|
||||
clone_tool->tx3, clone_tool->ty3,
|
||||
HANDLE_SIZE, HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_SQUARE,
|
||||
clone_tool->tx4, clone_tool->ty4,
|
||||
HANDLE_SIZE, HANDLE_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
|
||||
if (GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_IMAGE_CLONE &&
|
||||
|
@ -805,7 +805,7 @@ gimp_perspective_clone_tool_draw (GimpDrawTool *draw_tool)
|
|||
clone_tool->src_x,
|
||||
clone_tool->src_y,
|
||||
TARGET_SIZE, TARGET_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
draw_tool->display = tmp_display;
|
||||
}
|
||||
|
|
|
@ -236,9 +236,9 @@ static gboolean gimp_rectangle_tool_coord_outside (GimpRectangleTool
|
|||
|
||||
static gboolean gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
||||
const GimpCoords *coords,
|
||||
GtkAnchorType anchor);
|
||||
GimpHandleAnchor anchor);
|
||||
|
||||
static GtkAnchorType gimp_rectangle_tool_get_anchor (GimpRectangleToolPrivate *private);
|
||||
static GimpHandleAnchor gimp_rectangle_tool_get_anchor (GimpRectangleToolPrivate *private);
|
||||
|
||||
static void gimp_rectangle_tool_update_highlight (GimpRectangleTool *rect_tool);
|
||||
|
||||
|
@ -1596,55 +1596,55 @@ gimp_rectangle_tool_oper_update (GimpTool *tool,
|
|||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_NORTH_WEST))
|
||||
GIMP_HANDLE_ANCHOR_NORTH_WEST))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_UPPER_LEFT;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_SOUTH_EAST))
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_EAST))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_LOWER_RIGHT;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_NORTH_EAST))
|
||||
GIMP_HANDLE_ANCHOR_NORTH_EAST))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_UPPER_RIGHT;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_SOUTH_WEST))
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_WEST))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_LOWER_LEFT;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_WEST))
|
||||
GIMP_HANDLE_ANCHOR_WEST))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_LEFT;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_EAST))
|
||||
GIMP_HANDLE_ANCHOR_EAST))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_RIGHT;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_NORTH))
|
||||
GIMP_HANDLE_ANCHOR_NORTH))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_TOP;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_SOUTH))
|
||||
GIMP_HANDLE_ANCHOR_SOUTH))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_RESIZING_BOTTOM;
|
||||
}
|
||||
else if (gimp_rectangle_tool_coord_on_handle (rect_tool,
|
||||
coords,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
function = GIMP_RECTANGLE_TOOL_MOVING;
|
||||
}
|
||||
|
@ -1765,7 +1765,7 @@ gimp_rectangle_tool_draw (GimpDrawTool *draw_tool,
|
|||
(pub_y1 + pub_y2) / 2.0,
|
||||
CENTER_CROSS_SIZE,
|
||||
CENTER_CROSS_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
break;
|
||||
}
|
||||
else
|
||||
|
@ -1782,25 +1782,25 @@ gimp_rectangle_tool_draw (GimpDrawTool *draw_tool,
|
|||
pub_x2, pub_y2,
|
||||
private->corner_handle_w,
|
||||
private->corner_handle_h,
|
||||
GTK_ANCHOR_NORTH_WEST);
|
||||
GIMP_HANDLE_ANCHOR_NORTH_WEST);
|
||||
gimp_draw_tool_add_corner (draw_tool, FALSE, private->narrow_mode,
|
||||
pub_x1, pub_y1,
|
||||
pub_x2, pub_y2,
|
||||
private->corner_handle_w,
|
||||
private->corner_handle_h,
|
||||
GTK_ANCHOR_NORTH_EAST);
|
||||
GIMP_HANDLE_ANCHOR_NORTH_EAST);
|
||||
gimp_draw_tool_add_corner (draw_tool, FALSE, private->narrow_mode,
|
||||
pub_x1, pub_y1,
|
||||
pub_x2, pub_y2,
|
||||
private->corner_handle_w,
|
||||
private->corner_handle_h,
|
||||
GTK_ANCHOR_SOUTH_WEST);
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_WEST);
|
||||
gimp_draw_tool_add_corner (draw_tool, FALSE, private->narrow_mode,
|
||||
pub_x1, pub_y1,
|
||||
pub_x2, pub_y2,
|
||||
private->corner_handle_w,
|
||||
private->corner_handle_h,
|
||||
GTK_ANCHOR_SOUTH_EAST);
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_EAST);
|
||||
|
||||
gimp_draw_tool_pop_group (draw_tool);
|
||||
break;
|
||||
|
@ -2741,7 +2741,7 @@ gimp_rectangle_tool_coord_outside (GimpRectangleTool *rect_tool,
|
|||
static gboolean
|
||||
gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
||||
const GimpCoords *coords,
|
||||
GtkAnchorType anchor)
|
||||
GimpHandleAnchor anchor)
|
||||
{
|
||||
GimpRectangleToolPrivate *private;
|
||||
GimpDisplayShell *shell;
|
||||
|
@ -2769,7 +2769,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
|
||||
switch (anchor)
|
||||
{
|
||||
case GTK_ANCHOR_NORTH_WEST:
|
||||
case GIMP_HANDLE_ANCHOR_NORTH_WEST:
|
||||
handle_x = pub_x1;
|
||||
handle_y = pub_y1;
|
||||
handle_width = private->corner_handle_w;
|
||||
|
@ -2779,7 +2779,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = -1;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_SOUTH_EAST:
|
||||
case GIMP_HANDLE_ANCHOR_SOUTH_EAST:
|
||||
handle_x = pub_x2;
|
||||
handle_y = pub_y2;
|
||||
handle_width = private->corner_handle_w;
|
||||
|
@ -2789,7 +2789,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = 1;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_NORTH_EAST:
|
||||
case GIMP_HANDLE_ANCHOR_NORTH_EAST:
|
||||
handle_x = pub_x2;
|
||||
handle_y = pub_y1;
|
||||
handle_width = private->corner_handle_w;
|
||||
|
@ -2799,7 +2799,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = -1;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_SOUTH_WEST:
|
||||
case GIMP_HANDLE_ANCHOR_SOUTH_WEST:
|
||||
handle_x = pub_x1;
|
||||
handle_y = pub_y2;
|
||||
handle_width = private->corner_handle_w;
|
||||
|
@ -2809,7 +2809,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = 1;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_WEST:
|
||||
case GIMP_HANDLE_ANCHOR_WEST:
|
||||
handle_x = pub_x1;
|
||||
handle_y = pub_y1 + rect_h / 2;
|
||||
handle_width = private->corner_handle_w;
|
||||
|
@ -2819,7 +2819,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = 0;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_EAST:
|
||||
case GIMP_HANDLE_ANCHOR_EAST:
|
||||
handle_x = pub_x2;
|
||||
handle_y = pub_y1 + rect_h / 2;
|
||||
handle_width = private->corner_handle_w;
|
||||
|
@ -2829,7 +2829,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = 0;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_NORTH:
|
||||
case GIMP_HANDLE_ANCHOR_NORTH:
|
||||
handle_x = pub_x1 + rect_w / 2;
|
||||
handle_y = pub_y1;
|
||||
handle_width = private->top_and_bottom_handle_w;
|
||||
|
@ -2839,7 +2839,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = -1;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_SOUTH:
|
||||
case GIMP_HANDLE_ANCHOR_SOUTH:
|
||||
handle_x = pub_x1 + rect_w / 2;
|
||||
handle_y = pub_y2;
|
||||
handle_width = private->top_and_bottom_handle_w;
|
||||
|
@ -2849,7 +2849,7 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
narrow_mode_y_dir = 1;
|
||||
break;
|
||||
|
||||
case GTK_ANCHOR_CENTER:
|
||||
case GIMP_HANDLE_ANCHOR_CENTER:
|
||||
handle_x = pub_x1 + rect_w / 2;
|
||||
handle_y = pub_y1 + rect_h / 2;
|
||||
|
||||
|
@ -2883,37 +2883,37 @@ gimp_rectangle_tool_coord_on_handle (GimpRectangleTool *rect_tool,
|
|||
anchor);
|
||||
}
|
||||
|
||||
static GtkAnchorType
|
||||
static GimpHandleAnchor
|
||||
gimp_rectangle_tool_get_anchor (GimpRectangleToolPrivate *private)
|
||||
{
|
||||
switch (private->function)
|
||||
{
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_UPPER_LEFT:
|
||||
return GTK_ANCHOR_NORTH_WEST;
|
||||
return GIMP_HANDLE_ANCHOR_NORTH_WEST;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_UPPER_RIGHT:
|
||||
return GTK_ANCHOR_NORTH_EAST;
|
||||
return GIMP_HANDLE_ANCHOR_NORTH_EAST;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_LOWER_LEFT:
|
||||
return GTK_ANCHOR_SOUTH_WEST;
|
||||
return GIMP_HANDLE_ANCHOR_SOUTH_WEST;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_LOWER_RIGHT:
|
||||
return GTK_ANCHOR_SOUTH_EAST;
|
||||
return GIMP_HANDLE_ANCHOR_SOUTH_EAST;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_LEFT:
|
||||
return GTK_ANCHOR_WEST;
|
||||
return GIMP_HANDLE_ANCHOR_WEST;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_RIGHT:
|
||||
return GTK_ANCHOR_EAST;
|
||||
return GIMP_HANDLE_ANCHOR_EAST;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_TOP:
|
||||
return GTK_ANCHOR_NORTH;
|
||||
return GIMP_HANDLE_ANCHOR_NORTH;
|
||||
|
||||
case GIMP_RECTANGLE_TOOL_RESIZING_BOTTOM:
|
||||
return GTK_ANCHOR_SOUTH;
|
||||
return GIMP_HANDLE_ANCHOR_SOUTH;
|
||||
|
||||
default:
|
||||
return GTK_ANCHOR_CENTER;
|
||||
return GIMP_HANDLE_ANCHOR_CENTER;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -387,7 +387,7 @@ gimp_source_tool_draw (GimpDrawTool *draw_tool)
|
|||
source_tool->src_x + off_x,
|
||||
source_tool->src_y + off_y,
|
||||
TARGET_SIZE, TARGET_SIZE,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
draw_tool->display = tmp_display;
|
||||
}
|
||||
|
|
|
@ -174,7 +174,7 @@ gimp_text_tool_editor_start (GimpTextTool *text_tool)
|
|||
gimp_display_shell_add_overlay (shell,
|
||||
text_tool->style_overlay,
|
||||
0, 0,
|
||||
GTK_ANCHOR_CENTER, 0, 0);
|
||||
GIMP_HANDLE_ANCHOR_CENTER, 0, 0);
|
||||
gimp_overlay_box_set_child_opacity (GIMP_OVERLAY_BOX (shell->canvas),
|
||||
text_tool->style_overlay, 0.7);
|
||||
|
||||
|
@ -214,7 +214,7 @@ gimp_text_tool_editor_position (GimpTextTool *text_tool)
|
|||
gimp_display_shell_move_overlay (shell,
|
||||
text_tool->style_overlay,
|
||||
x, y,
|
||||
GTK_ANCHOR_SOUTH_WEST, 4, 12);
|
||||
GIMP_HANDLE_ANCHOR_SOUTH_WEST, 4, 12);
|
||||
|
||||
#if 0
|
||||
gimp_overlay_box_set_child_angle (GIMP_OVERLAY_BOX (shell->canvas),
|
||||
|
@ -1279,7 +1279,7 @@ gimp_text_tool_im_preedit_start (GtkIMContext *context,
|
|||
text_tool->preedit_overlay,
|
||||
cursor_rect.x + off_x,
|
||||
cursor_rect.y + off_y,
|
||||
GTK_ANCHOR_NORTH_WEST, 0, 0);
|
||||
GIMP_HANDLE_ANCHOR_NORTH_WEST, 0, 0);
|
||||
gimp_overlay_box_set_child_opacity (GIMP_OVERLAY_BOX (shell->canvas),
|
||||
text_tool->preedit_overlay, 0.7);
|
||||
gtk_widget_show (text_tool->preedit_overlay);
|
||||
|
|
|
@ -630,7 +630,7 @@ gimp_transform_tool_oper_update (GimpTool *tool,
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
tr_tool->function = TRANSFORM_HANDLE_N;
|
||||
}
|
||||
|
@ -643,7 +643,7 @@ gimp_transform_tool_oper_update (GimpTool *tool,
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
tr_tool->function = TRANSFORM_HANDLE_E;
|
||||
}
|
||||
|
@ -656,7 +656,7 @@ gimp_transform_tool_oper_update (GimpTool *tool,
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
tr_tool->function = TRANSFORM_HANDLE_S;
|
||||
}
|
||||
|
@ -669,7 +669,7 @@ gimp_transform_tool_oper_update (GimpTool *tool,
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
tr_tool->function = TRANSFORM_HANDLE_W;
|
||||
}
|
||||
|
@ -683,7 +683,7 @@ gimp_transform_tool_oper_update (GimpTool *tool,
|
|||
tr_tool->tcx, tr_tool->tcy,
|
||||
MIN (tr_tool->handle_w, tr_tool->handle_h),
|
||||
MIN (tr_tool->handle_w, tr_tool->handle_h),
|
||||
GTK_ANCHOR_CENTER))
|
||||
GIMP_HANDLE_ANCHOR_CENTER))
|
||||
{
|
||||
tr_tool->function = TRANSFORM_HANDLE_CENTER;
|
||||
}
|
||||
|
@ -850,22 +850,22 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_SQUARE,
|
||||
tr_tool->tx1, tr_tool->ty1,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_SQUARE,
|
||||
tr_tool->tx2, tr_tool->ty2,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_SQUARE,
|
||||
tr_tool->tx3, tr_tool->ty3,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_SQUARE,
|
||||
tr_tool->tx4, tr_tool->ty4,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
if (tr_tool->use_mid_handles)
|
||||
{
|
||||
|
@ -878,7 +878,7 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
x = (tr_tool->tx2 + tr_tool->tx4) / 2.0;
|
||||
y = (tr_tool->ty2 + tr_tool->ty4) / 2.0;
|
||||
|
@ -887,7 +887,7 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
x = (tr_tool->tx3 + tr_tool->tx4) / 2.0;
|
||||
y = (tr_tool->ty3 + tr_tool->ty4) / 2.0;
|
||||
|
@ -896,7 +896,7 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
|
||||
x = (tr_tool->tx3 + tr_tool->tx1) / 2.0;
|
||||
y = (tr_tool->ty3 + tr_tool->ty1) / 2.0;
|
||||
|
@ -905,7 +905,7 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_SQUARE,
|
||||
x, y,
|
||||
tr_tool->handle_w, tr_tool->handle_h,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -918,12 +918,12 @@ gimp_transform_tool_draw (GimpDrawTool *draw_tool)
|
|||
GIMP_HANDLE_CIRCLE,
|
||||
tr_tool->tcx, tr_tool->tcy,
|
||||
d, d,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
gimp_draw_tool_add_handle (draw_tool,
|
||||
GIMP_HANDLE_CROSS,
|
||||
tr_tool->tcx, tr_tool->tcy,
|
||||
d, d,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
|
||||
if (tr_tool->type == GIMP_TRANSFORM_TYPE_SELECTION)
|
||||
|
|
|
@ -1438,7 +1438,7 @@ gimp_vector_tool_draw (GimpDrawTool *draw_tool)
|
|||
cur_anchor->position.y,
|
||||
TARGET,
|
||||
TARGET,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1486,7 +1486,7 @@ gimp_vector_tool_draw (GimpDrawTool *draw_tool)
|
|||
cur_anchor->position.y,
|
||||
TARGET - 3,
|
||||
TARGET - 3,
|
||||
GTK_ANCHOR_CENTER);
|
||||
GIMP_HANDLE_ANCHOR_CENTER);
|
||||
}
|
||||
|
||||
g_list_free (draw_anchors);
|
||||
|
|
Loading…
Reference in a new issue