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

app: turn GimpCanvasItem's stroke() and fill() into virtual functions

Browse Source
This commit is contained in:
Michael Natterer
2010-09-29 23:40:45 +02:00
parent 1f8a835e40
commit 7b5316825c
2 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/display/gimpcanvasitem.c
View File

@ -72,6 +72,12 @@ static void gimp_canvas_item_real_draw (GimpCanvasItem *item,
cairo_t *cr); cairo_t *cr);
static GdkRegion * gimp_canvas_item_real_get_extents (GimpCanvasItem *item, static GdkRegion * gimp_canvas_item_real_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell); GimpDisplayShell *shell);
static void gimp_canvas_item_real_stroke (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
static void gimp_canvas_item_real_fill (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
G_DEFINE_TYPE (GimpCanvasItem, gimp_canvas_item, G_DEFINE_TYPE (GimpCanvasItem, gimp_canvas_item,
@ -90,6 +96,8 @@ gimp_canvas_item_class_init (GimpCanvasItemClass *klass)
klass->draw = gimp_canvas_item_real_draw; klass->draw = gimp_canvas_item_real_draw;
klass->get_extents = gimp_canvas_item_real_get_extents; klass->get_extents = gimp_canvas_item_real_get_extents;
klass->stroke = gimp_canvas_item_real_stroke;
klass->fill = gimp_canvas_item_real_fill;
g_object_class_install_property (object_class, PROP_LINE_CAP, g_object_class_install_property (object_class, PROP_LINE_CAP,
g_param_spec_int ("line-cap", g_param_spec_int ("line-cap",
@ -180,6 +188,37 @@ gimp_canvas_item_real_get_extents (GimpCanvasItem *item,
return NULL; return NULL;
} }
static void
gimp_canvas_item_real_stroke (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr)
{
GimpCanvasItemPrivate *private = GET_PRIVATE (item);
cairo_set_line_cap (cr, private->line_cap);
gimp_display_shell_set_tool_bg_style (shell, cr);
cairo_stroke_preserve (cr);
gimp_display_shell_set_tool_fg_style (shell, cr, private->highlight);
cairo_stroke (cr);
}
static void
gimp_canvas_item_real_fill (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr)
{
GimpCanvasItemPrivate *private = GET_PRIVATE (item);
gimp_display_shell_set_tool_bg_style (shell, cr);
cairo_set_line_width (cr, 2.0);
cairo_stroke_preserve (cr);
gimp_display_shell_set_tool_fg_style (shell, cr, private->highlight);
cairo_fill (cr);
}
/* public functions */ /* public functions */
@ -298,13 +337,7 @@ _gimp_canvas_item_stroke (GimpCanvasItem *item,
if (private->suspend_stroking == 0) if (private->suspend_stroking == 0)
{ {
cairo_set_line_cap (cr, private->line_cap); GIMP_CANVAS_ITEM_GET_CLASS (item)->stroke (item, shell, cr);
gimp_display_shell_set_tool_bg_style (shell, cr);
cairo_stroke_preserve (cr);
gimp_display_shell_set_tool_fg_style (shell, cr, private->highlight);
cairo_stroke (cr);
} }
else else
{ {
@ -324,12 +357,7 @@ _gimp_canvas_item_fill (GimpCanvasItem *item,
if (private->suspend_filling == 0) if (private->suspend_filling == 0)
{ {
gimp_display_shell_set_tool_bg_style (shell, cr); GIMP_CANVAS_ITEM_GET_CLASS (item)->fill (item, shell, cr);
cairo_set_line_width (cr, 2.0);
cairo_stroke_preserve (cr);
gimp_display_shell_set_tool_fg_style (shell, cr, private->highlight);
cairo_fill (cr);
} }
else else
{ {

7
app/display/gimpcanvasitem.h
View File

@ -49,6 +49,13 @@ struct _GimpCanvasItemClass
cairo_t *cr); cairo_t *cr);
GdkRegion * (* get_extents) (GimpCanvasItem *item, GdkRegion * (* get_extents) (GimpCanvasItem *item,
GimpDisplayShell *shell); GimpDisplayShell *shell);
void (* stroke) (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
void (* fill) (GimpCanvasItem *item,
GimpDisplayShell *shell,
cairo_t *cr);
}; };