Skip to content

GitLab

GIMP
GIMP
Commit d3f19baf authored by Michael Natterer's avatar Michael Natterer 😴
Browse files
Options

app: remove "shell" parameter from GimpCanvasItem's public APIs 

because each item has a shell now. Keep the parameter in the virtual
functions though because that saves a lot of code in the subclasses.
parent 33ab9451
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 45 deletions
app/display/gimpcanvasarc.c
View file @ d3f19baf
......@@ -279,9 +279,9 @@ gimp_canvas_arc_draw (GimpCanvasItem *item,
cairo_restore (cr);
if (private->filled)
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
else
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
}
static GdkRegion *
......
app/display/gimpcanvasboundary.c
View file @ d3f19baf
......@@ -242,7 +242,7 @@ gimp_canvas_boundary_draw (GimpCanvasItem *item,
gimp_cairo_add_segments (cr, segs, private->n_segs);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
g_free (segs);
}
......
app/display/gimpcanvascorner.c
View file @ d3f19baf
......@@ -405,7 +405,7 @@ gimp_canvas_corner_draw (GimpCanvasItem *item,
cairo_rectangle (cr, x, y, w, h);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
}
static GdkRegion *
......
app/display/gimpcanvasgroup.c
View file @ d3f19baf
......@@ -185,14 +185,14 @@ gimp_canvas_group_draw (GimpCanvasItem *item,
{
GimpCanvasItem *sub_item = list->data;
gimp_canvas_item_draw (sub_item, shell, cr);
gimp_canvas_item_draw (sub_item, cr);
}
if (private->group_stroking)
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
if (private->group_filling)
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
}
static GdkRegion *
......@@ -206,8 +206,7 @@ gimp_canvas_group_get_extents (GimpCanvasItem *item,
for (list = private->items; list; list = g_list_next (list))
{
GimpCanvasItem *sub_item = list->data;
GdkRegion *sub_region = gimp_canvas_item_get_extents (sub_item,
shell);
GdkRegion *sub_region = gimp_canvas_item_get_extents (sub_item);
if (! region)
{
......
app/display/gimpcanvasguide.c
View file @ d3f19baf
......@@ -223,7 +223,7 @@ gimp_canvas_guide_draw (GimpCanvasItem *item,
cairo_move_to (cr, x1, y1);
cairo_line_to (cr, x2, y2);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
}
static GdkRegion *
......
app/display/gimpcanvashandle.c
View file @ d3f19baf
......@@ -425,13 +425,13 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
case GIMP_HANDLE_SQUARE:
cairo_rectangle (cr, x, y, private->width - 1.0, private->height - 1.0);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
break;
case GIMP_HANDLE_FILLED_SQUARE:
cairo_rectangle (cr, x - 0.5, y - 0.5, private->width, private->height);
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
break;
case GIMP_HANDLE_CIRCLE:
......@@ -439,7 +439,7 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
private->start_angle,
private->slice_angle);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
break;
case GIMP_HANDLE_FILLED_CIRCLE:
......@@ -449,7 +449,7 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
private->start_angle,
private->slice_angle);
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
break;
case GIMP_HANDLE_CROSS:
......@@ -459,7 +459,7 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
cairo_move_to (cr, x, y - private->height / 2);
cairo_line_to (cr, x, y + private->height / 2);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
break;
default:
......
app/display/gimpcanvasitem.c
View file @ d3f19baf
......@@ -252,29 +252,33 @@ gimp_canvas_item_real_fill (GimpCanvasItem *item,
/* public functions */
void
gimp_canvas_item_draw (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr)
gimp_canvas_item_draw (GimpCanvasItem *item,
cairo_t *cr)
{
GimpCanvasItemPrivate *private;
g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (cr != NULL);
private = GET_PRIVATE (item);
cairo_save (cr);
GIMP_CANVAS_ITEM_GET_CLASS (item)->draw (item, shell, cr);
GIMP_CANVAS_ITEM_GET_CLASS (item)->draw (item, private->shell, cr);
cairo_restore (cr);
}
GdkRegion *
gimp_canvas_item_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
gimp_canvas_item_get_extents (GimpCanvasItem *item)
{
GimpCanvasItemPrivate *private;
g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), NULL);
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
return GIMP_CANVAS_ITEM_GET_CLASS (item)->get_extents (item, shell);
private = GET_PRIVATE (item);
return GIMP_CANVAS_ITEM_GET_CLASS (item)->get_extents (item, private->shell);
}
void
......@@ -367,9 +371,8 @@ gimp_canvas_item_resume_filling (GimpCanvasItem *item)
/* protected functions */
void
_gimp_canvas_item_stroke (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr)
_gimp_canvas_item_stroke (GimpCanvasItem *item,
cairo_t *cr)
{
GimpCanvasItemPrivate *private = GET_PRIVATE (item);
......@@ -378,7 +381,7 @@ _gimp_canvas_item_stroke (GimpCanvasItem *item,
if (private->suspend_stroking == 0)
{
GIMP_CANVAS_ITEM_GET_CLASS (item)->stroke (item, shell, cr);
GIMP_CANVAS_ITEM_GET_CLASS (item)->stroke (item, private->shell, cr);
}
else
{
......@@ -388,7 +391,6 @@ _gimp_canvas_item_stroke (GimpCanvasItem *item,
void
_gimp_canvas_item_fill (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr)
{
GimpCanvasItemPrivate *private = GET_PRIVATE (item);
......@@ -398,7 +400,7 @@ _gimp_canvas_item_fill (GimpCanvasItem *item,
if (private->suspend_filling == 0)
{
GIMP_CANVAS_ITEM_GET_CLASS (item)->fill (item, shell, cr);
GIMP_CANVAS_ITEM_GET_CLASS (item)->fill (item, private->shell, cr);
}
else
{
......
app/display/gimpcanvasitem.h
View file @ d3f19baf
......@@ -62,10 +62,8 @@ struct _GimpCanvasItemClass
GType gimp_canvas_item_get_type (void) G_GNUC_CONST;
void gimp_canvas_item_draw (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
GdkRegion * gimp_canvas_item_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell);
GdkRegion * gimp_canvas_item_get_extents (GimpCanvasItem *item);
void gimp_canvas_item_set_line_cap (GimpCanvasItem *item,
cairo_line_cap_t line_cap);
......@@ -84,10 +82,8 @@ void gimp_canvas_item_resume_filling (GimpCanvasItem *item);
/* protected */
void _gimp_canvas_item_stroke (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
void _gimp_canvas_item_fill (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
......
app/display/gimpcanvasline.c
View file @ d3f19baf
......@@ -219,7 +219,7 @@ gimp_canvas_line_draw (GimpCanvasItem *item,
cairo_move_to (cr, x1, y1);
cairo_line_to (cr, x2, y2);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
}
static GdkRegion *
......
app/display/gimpcanvaspolygon.c
View file @ d3f19baf
......@@ -213,9 +213,9 @@ gimp_canvas_polygon_draw (GimpCanvasItem *item,
}
if (private->filled)
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
else
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
g_free (points);
}
......
app/display/gimpcanvasrectangle.c
View file @ d3f19baf
......@@ -253,9 +253,9 @@ gimp_canvas_rectangle_draw (GimpCanvasItem *item,
cairo_rectangle (cr, x, y, w, h);
if (private->filled)
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
else
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
}
static GdkRegion *
......
app/display/gimpcanvassamplepoint.c
View file @ d3f19baf
......@@ -246,7 +246,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem *item,
cairo_arc_negative (cr, x, y, HALF_SIZE, 0.0, 0.5 * G_PI);
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
layout = gimp_canvas_get_layout (GIMP_CANVAS (shell->canvas),
"%d", private->index);
......@@ -254,7 +254,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem *item,
cairo_move_to (cr, x + 2.5, y + 2.5);
pango_cairo_show_layout (cr, layout);
_gimp_canvas_item_fill (item, shell, cr);
_gimp_canvas_item_fill (item, cr);
}
static GdkRegion *
......
app/display/gimpcanvastextcursor.c
View file @ d3f19baf
......@@ -261,7 +261,7 @@ gimp_canvas_text_cursor_draw (GimpCanvasItem *item,
cairo_line_to (cr, x + 3.0, y + h);
}
_gimp_canvas_item_stroke (item, shell, cr);
_gimp_canvas_item_stroke (item, cr);
}
static GdkRegion *
......
app/display/gimpdisplayshell-callbacks.c
View file @ d3f19baf
......@@ -2342,7 +2342,7 @@ gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell,
/* draw canvas items */
cairo_save (cr);
gimp_canvas_item_draw (shell->canvas_item, shell, cr);
gimp_canvas_item_draw (shell->canvas_item, cr);
cairo_restore (cr);
/* and the cursor (if we have a software cursor) */
......
app/display/gimpdisplayshell-expose.c
View file @ d3f19baf
......@@ -73,7 +73,7 @@ gimp_display_shell_expose_item (GimpDisplayShell *shell,
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
region = gimp_canvas_item_get_extents (item, shell);
region = gimp_canvas_item_get_extents (item);
if (region)
{
......
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