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

themingbackground: Avoid erroring cairo context

Browse Source
This commit is contained in:
Benjamin Otte 2011-12-23 22:23:40 +01:00
parent 396ae8f1de
commit ab1699510e
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkthemingbackground.c
View File

@ -304,9 +304,6 @@ _gtk_theming_background_paint (GtkThemingBackground *bg,
"background-repeat", &repeat,
NULL);
/* Fill background color first */
cairo_fill_preserve (cr);
if (cairo_pattern_get_surface (bg->pattern, &surface) != CAIRO_STATUS_SUCCESS)
surface = NULL;
@ -327,16 +324,22 @@ _gtk_theming_background_paint (GtkThemingBackground *bg,
scale_height = bg->image_rect.height;
}
cairo_translate (cr, bg->image_rect.x, bg->image_rect.y);
cairo_scale (cr, scale_width, scale_height);
cairo_set_source (cr, bg->pattern);
cairo_scale (cr, 1.0 / scale_width, 1.0 / scale_height);
cairo_translate (cr, -bg->image_rect.x, -bg->image_rect.y);
if (scale_width && scale_height)
{
/* Fill background color first */
cairo_fill_preserve (cr);
g_free (repeat);
cairo_translate (cr, bg->image_rect.x, bg->image_rect.y);
cairo_scale (cr, scale_width, scale_height);
cairo_set_source (cr, bg->pattern);
cairo_scale (cr, 1.0 / scale_width, 1.0 / scale_height);
cairo_translate (cr, -bg->image_rect.x, -bg->image_rect.y);
cairo_pattern_destroy (bg->pattern);
bg->pattern = NULL;
g_free (repeat);
cairo_pattern_destroy (bg->pattern);
bg->pattern = NULL;
}
}
cairo_fill (cr);