GtkStyleContext: Fix animation framework to work with the new draw() semantics.

[~andy/gtk] / gtk / gtkstylecontext.c

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 09236331f0ae6fdfd5b413297de9e0b0e788a6b0..69e7797d89cf9cb83339e6ed89bfff3a36596402 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -1852,7 +1852,9 @@ _gtk_style_context_invalidate_animation_areas (GtkStyleContext *context)
 }
 
 void
-_gtk_style_context_coalesce_animation_areas (GtkStyleContext *context)
+_gtk_style_context_coalesce_animation_areas (GtkStyleContext *context,
+                                             gint             rel_x,
+                                             gint             rel_y)
 {
   GtkStyleContextPrivate *priv;
   GSList *l;
@@ -1885,11 +1887,16 @@ _gtk_style_context_coalesce_animation_areas (GtkStyleContext *context)
           cairo_rectangle_int_t *rect;
 
           rect = &g_array_index (info->rectangles, cairo_rectangle_int_t, i);
+          rect->x += rel_x;
+          rect->y += rel_y;
+
           cairo_region_union_rectangle (info->invalidation_region, rect);
         }
 
       g_array_remove_range (info->rectangles, 0, info->rectangles->len);
     }
+
+  priv->animations_invalidated = FALSE;
 }
 
 static void