]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkthemingbackground.c
stylecontext: Do invalidation on first resize container
[~andy/gtk] / gtk / gtkthemingbackground.c
index cd29de5a6d76693881ba45e2199b37e3d0204b0f..579d2be4dea32abe70be40ad73cd70fa39cd87b1 100644 (file)
  */
 #include "fallback-c89.c"
 
-typedef struct {
-  cairo_rectangle_t image_rect;
-
-  gint idx;
-} GtkThemingBackgroundLayer;
-
-static void
-_gtk_theming_background_layer_apply_origin (GtkThemingBackground *bg,
-                                            GtkThemingBackgroundLayer *layer)
-{
-  cairo_rectangle_t image_rect;
-  GtkCssValue *value = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_ORIGIN);
-  GtkCssArea origin = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (value, layer->idx));
-
-  /* The default size of the background image depends on the
-     background-origin value as this affects the top left
-     and the bottom right corners. */
-  switch (origin) {
-  case GTK_CSS_AREA_BORDER_BOX:
-    image_rect.x = 0;
-    image_rect.y = 0;
-    image_rect.width = bg->paint_area.width;
-    image_rect.height = bg->paint_area.height;
-    break;
-  case GTK_CSS_AREA_CONTENT_BOX:
-    image_rect.x = bg->border.left + bg->padding.left;
-    image_rect.y = bg->border.top + bg->padding.top;
-    image_rect.width = bg->paint_area.width - bg->border.left - bg->border.right - bg->padding.left - bg->padding.right;
-    image_rect.height = bg->paint_area.height - bg->border.top - bg->border.bottom - bg->padding.top - bg->padding.bottom;
-    break;
-  case GTK_CSS_AREA_PADDING_BOX:
-  default:
-    image_rect.x = bg->border.left;
-    image_rect.y = bg->border.top;
-    image_rect.width = bg->paint_area.width - bg->border.left - bg->border.right;
-    image_rect.height = bg->paint_area.height - bg->border.top - bg->border.bottom;
-    break;
-  }
-
-  /* XXX: image_rect might have negative width/height here.
-   * Do we need to do something about it? */
-  layer->image_rect = image_rect;
-}
-
 static const GtkRoundedBox *
 gtk_theming_background_get_box (GtkThemingBackground *bg,
                                 GtkCssArea            area)
@@ -126,30 +82,37 @@ _gtk_theming_background_paint_color (GtkThemingBackground *bg,
 
 static void
 _gtk_theming_background_paint_layer (GtkThemingBackground *bg,
-                                     GtkThemingBackgroundLayer *layer,
+                                     guint                 idx,
                                      cairo_t              *cr)
 {
   GtkCssRepeatStyle hrepeat, vrepeat;
   const GtkCssValue *pos, *repeat;
   GtkCssImage *image;
+  const GtkRoundedBox *origin;
   double image_width, image_height;
   double width, height;
 
-  pos = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_POSITION), layer->idx);
-  repeat = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_REPEAT), layer->idx);
+  pos = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_POSITION), idx);
+  repeat = _gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_REPEAT), idx);
   hrepeat = _gtk_css_background_repeat_value_get_x (repeat);
   vrepeat = _gtk_css_background_repeat_value_get_y (repeat);
   image = _gtk_css_image_value_get_image (
               _gtk_css_array_value_get_nth (
                   _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_IMAGE),
-                  layer->idx));
-  width = layer->image_rect.width;
-  height = layer->image_rect.height;
+                  idx));
+  origin = gtk_theming_background_get_box (
+               bg,
+               _gtk_css_area_value_get (
+                   _gtk_css_array_value_get_nth (
+                       _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_ORIGIN),
+                       idx)));
+  width = origin->box.width;
+  height = origin->box.height;
 
   if (image == NULL || width <= 0 || height <= 0)
     return;
 
-  _gtk_css_bg_size_value_compute_size (_gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_SIZE), layer->idx),
+  _gtk_css_bg_size_value_compute_size (_gtk_css_array_value_get_nth (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_SIZE), idx),
                                        image,
                                        width,
                                        height,
@@ -174,12 +137,12 @@ _gtk_theming_background_paint_layer (GtkThemingBackground *bg,
           _gtk_css_area_value_get (
               _gtk_css_array_value_get_nth (
                   _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_CLIP),
-                  layer->idx))),
+                  idx))),
       cr);
   cairo_clip (cr);
 
 
-  cairo_translate (cr, layer->image_rect.x, layer->image_rect.y);
+  cairo_translate (cr, origin->box.x, origin->box.y);
 
   if (hrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT && vrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT)
     {
@@ -309,23 +272,14 @@ _gtk_theming_background_apply_shadow (GtkThemingBackground *bg,
                                     &bg->padding_box);
 }
 
-static void
-_gtk_theming_background_init_layer (GtkThemingBackground *bg,
-                                    GtkThemingBackgroundLayer *layer,
-                                    gint idx)
-{
-  layer->idx = idx;
-
-  _gtk_theming_background_layer_apply_origin (bg, layer);
-}
-
 static void
 _gtk_theming_background_init_context (GtkThemingBackground *bg)
 {
   GtkStateFlags flags = gtk_style_context_get_state (bg->context);
+  GtkBorder border, padding;
 
-  gtk_style_context_get_border (bg->context, flags, &bg->border);
-  gtk_style_context_get_padding (bg->context, flags, &bg->padding);
+  gtk_style_context_get_border (bg->context, flags, &border);
+  gtk_style_context_get_padding (bg->context, flags, &padding);
   gtk_style_context_get_background_color (bg->context, flags, &bg->bg_color);
 
   /* In the CSS box model, by default the background positioning area is
@@ -341,13 +295,13 @@ _gtk_theming_background_init_context (GtkThemingBackground *bg)
 
   bg->padding_box = bg->border_box;
   _gtk_rounded_box_shrink (&bg->padding_box,
-                          bg->border.top, bg->border.right,
-                          bg->border.bottom, bg->border.left);
+                          border.top, border.right,
+                          border.bottom, border.left);
 
   bg->content_box = bg->padding_box;
   _gtk_rounded_box_shrink (&bg->content_box,
-                          bg->padding.top, bg->padding.right,
-                          bg->padding.bottom, bg->padding.left);
+                          padding.top, padding.right,
+                          padding.bottom, padding.left);
 }
 
 void
@@ -397,7 +351,6 @@ _gtk_theming_background_render (GtkThemingBackground *bg,
                                 cairo_t              *cr)
 {
   gint idx;
-  GtkThemingBackgroundLayer layer;
   GtkCssValue *background_image;
 
   background_image = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_IMAGE);
@@ -409,8 +362,7 @@ _gtk_theming_background_render (GtkThemingBackground *bg,
 
   for (idx = _gtk_css_array_value_get_n_values (background_image) - 1; idx >= 0; idx--)
     {
-      _gtk_theming_background_init_layer (bg, &layer, idx);
-      _gtk_theming_background_paint_layer (bg, &layer, cr);
+      _gtk_theming_background_paint_layer (bg, idx, cr);
     }
 
   _gtk_theming_background_apply_shadow (bg, cr);