From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 24 Nov 2011 21:11:00 +0000 (+0100)
Subject: css: Always draw the bg color under the bg image
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=75642d3af2c7344348a1c199e672cdadb1039b8b;p=~andy%2Fgtk

css: Always draw the bg color under the bg image
---

diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 0d30b9769..307a9b622 100644
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1721,11 +1721,15 @@ render_background_internal (GtkThemingEngine *engine,
 
   _gtk_rounded_box_path (&clip_box, cr);
 
+  gdk_cairo_set_source_rgba (cr, &bg_color);
   if (pattern)
     {
       cairo_surface_t *surface;
       int scale_width, scale_height;
 
+      /* Fill background color first */
+      cairo_fill_preserve (cr);
+
       if (cairo_pattern_get_surface (pattern, &surface) != CAIRO_STATUS_SUCCESS)
           surface = NULL;
 
@@ -1752,8 +1756,6 @@ render_background_internal (GtkThemingEngine *engine,
       cairo_scale (cr, 1.0 / scale_width, 1.0 / scale_height);
       cairo_translate (cr, -bg_x, -bg_y);
     }
-  else
-    gdk_cairo_set_source_rgba (cr, &bg_color);
 
   cairo_fill (cr);