Use cairo_push_group() to mix backgrounds during transitions

It also helps remove the cairo_clip() call to achieve the rounded
shape.

diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c
index 1db600ef147fc348f416bc099a7eadb74bc7b3dd..a91daba8753546ee344fea9c8cea8d59b3732c65 100644 (file)
--- a/gtk/gtkthemingengine.c
+++ b/gtk/gtkthemingengine.c
@@ -1498,10 +1498,8 @@ render_background_internal (GtkThemingEngine *engine,
                           NULL);
 
   running = gtk_theming_engine_state_is_running (engine, GTK_STATE_PRELIGHT, &progress);
-  _cairo_round_rectangle_sides (cr, (gdouble) radius,
-                                x, y, width, height,
-                                SIDE_ALL, junction);
-  cairo_clip (cr);
+
+  cairo_push_group (cr);
 
   if (gtk_theming_engine_has_class (engine, "background"))
     {
@@ -1711,6 +1709,14 @@ render_background_internal (GtkThemingEngine *engine,
       cairo_pattern_destroy (mask);
     }
 
+  cairo_pop_group_to_source (cr);
+
+  _cairo_round_rectangle_sides (cr, (gdouble) radius,
+                                x, y, width, height,
+                                SIDE_ALL, junction);
+  cairo_close_path (cr);
+  cairo_fill (cr);
+
   cairo_restore (cr);
 
   gdk_rgba_free (bg_color);