AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

image: Use Cairo instead of gdk_draw_drawable()

Browse Source
This commit is contained in:
Benjamin Otte 2010-07-14 19:46:58 +02:00
parent 847d401df3
commit 8f6a014de4
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/gtkimage.c
View File

@ -2152,12 +2152,6 @@ gtk_image_expose (GtkWidget *widget,
break;
}
if (mask)
{
gdk_gc_set_clip_mask (widget->style->black_gc, mask);
gdk_gc_set_clip_origin (widget->style->black_gc, mask_x, mask_y);
}
if (rectangle_intersect_even (&area, &image_bound))
{
if (pixbuf)
@ -2203,15 +2197,34 @@ gtk_image_expose (GtkWidget *widget,
}
else
{
cairo_t *cr;
cairo_pattern_t *mask_pattern;
switch (priv->storage_type)
{
case GTK_IMAGE_PIXMAP:
gdk_draw_drawable (widget->window,
widget->style->black_gc,
priv->data.pixmap.pixmap,
image_bound.x - x, image_bound.y - y,
image_bound.x, image_bound.y,
image_bound.width, image_bound.height);
cr = gdk_cairo_create (widget->window);
if (mask)
{
/* hack to get the mask pattern */
gdk_cairo_set_source_pixmap (cr, mask, mask_x, mask_y);
mask_pattern = cairo_get_source (cr);
cairo_pattern_reference (mask_pattern);
gdk_cairo_set_source_pixmap (cr, priv->data.pixmap.pixmap, x, y);
gdk_cairo_rectangle (cr, &image_bound);
cairo_clip (cr);
cairo_mask (cr, mask_pattern);
}
else
{
gdk_cairo_set_source_pixmap (cr, priv->data.pixmap.pixmap, x, y);
gdk_cairo_rectangle (cr, &image_bound);
cairo_fill (cr);
}
cairo_destroy (cr);
break;
case GTK_IMAGE_IMAGE:
@ -2236,12 +2249,6 @@ gtk_image_expose (GtkWidget *widget,
}
} /* if rectangle intersects */
if (mask)
{
gdk_gc_set_clip_mask (widget->style->black_gc, NULL);
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
}
if (pixbuf)
g_object_unref (pixbuf);