]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkthemingbackground.c
filechooserbutton: Do not propagate state from the dialog unless it is active
[~andy/gtk] / gtk / gtkthemingbackground.c
index 0453f82327ec6c7c0418daf43b5ed3689eca2bed..579d2be4dea32abe70be40ad73cd70fa39cd87b1 100644 (file)
  */
 #include "fallback-c89.c"
 
-typedef struct {
-  cairo_rectangle_t image_rect;
-  GtkCssImage *image;
-  GtkRoundedBox clip_box;
-
-  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 void
-_gtk_theming_background_apply_clip (GtkThemingBackground *bg,
-                                    GtkRoundedBox *box,
-                                    GtkCssArea clip)
+static const GtkRoundedBox *
+gtk_theming_background_get_box (GtkThemingBackground *bg,
+                                GtkCssArea            area)
 {
-  if (clip == GTK_CSS_AREA_PADDING_BOX)
+  switch (area)
     {
-      _gtk_rounded_box_shrink (box,
-                              bg->border.top, bg->border.right,
-                              bg->border.bottom, bg->border.left);
-    }
-  else if (clip == GTK_CSS_AREA_CONTENT_BOX)
-    {
-      _gtk_rounded_box_shrink (box,
-                              bg->border.top + bg->padding.top,
-                              bg->border.right + bg->padding.right,
-                              bg->border.bottom + bg->padding.bottom,
-                              bg->border.left + bg->padding.left);
-    }
-}
-
-static void
-_gtk_theming_background_layer_apply_clip (GtkThemingBackground *bg,
-                                          GtkThemingBackgroundLayer *layer)
-{
-  GtkCssValue *value = _gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_CLIP);
-  GtkCssArea clip = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (value, layer->idx));
-
-  _gtk_theming_background_apply_clip (bg, &layer->clip_box, clip);
+    case GTK_CSS_AREA_BORDER_BOX:
+      return &bg->border_box;
+    case GTK_CSS_AREA_PADDING_BOX:
+      return &bg->padding_box;
+    case GTK_CSS_AREA_CONTENT_BOX:
+      return &bg->content_box;
+    default:
+      g_return_val_if_reached (&bg->border_box);
+  }
 }
 
 static void
@@ -124,18 +64,14 @@ _gtk_theming_background_paint_color (GtkThemingBackground *bg,
                                      cairo_t              *cr,
                                      GtkCssValue          *background_image)
 {
-  GtkRoundedBox clip_box;
   gint n_values = _gtk_css_array_value_get_n_values (background_image);
   GtkCssArea clip = _gtk_css_area_value_get 
     (_gtk_css_array_value_get_nth 
      (_gtk_style_context_peek_property (bg->context, GTK_CSS_PROPERTY_BACKGROUND_CLIP), 
       n_values - 1));
 
-  clip_box = bg->border_box;
-  _gtk_theming_background_apply_clip (bg, &clip_box, clip);
-
   cairo_save (cr);
-  _gtk_rounded_box_path (&clip_box, cr);
+  _gtk_rounded_box_path (gtk_theming_background_get_box (bg, clip), cr);
   cairo_clip (cr);
 
   gdk_cairo_set_source_rgba (cr, &bg->bg_color);
@@ -146,45 +82,67 @@ _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;
 
-  if (layer->image == NULL
-      || layer->image_rect.width <= 0
-      || layer->image_rect.height <= 0)
-    return;
-
-  cairo_save (cr);
-
-  _gtk_rounded_box_path (&layer->clip_box, cr);
-  cairo_clip (cr);
-
-  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);
-  width = layer->image_rect.width;
-  height = layer->image_rect.height;
+  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),
+                  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),
-                                       layer->image,
+  _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,
                                        &image_width,
                                        &image_height);
 
+  if (image_width <= 0 || image_height <= 0)
+    return;
+
   /* optimization */
   if (image_width == width)
     hrepeat = GTK_CSS_REPEAT_STYLE_NO_REPEAT;
   if (image_height == height)
     vrepeat = GTK_CSS_REPEAT_STYLE_NO_REPEAT;
 
-  cairo_translate (cr, layer->image_rect.x, layer->image_rect.y);
+
+  cairo_save (cr);
+
+  _gtk_rounded_box_path (
+      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_CLIP),
+                  idx))),
+      cr);
+  cairo_clip (cr);
+
+
+  cairo_translate (cr, origin->box.x, origin->box.y);
 
   if (hrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT && vrepeat == GTK_CSS_REPEAT_STYLE_NO_REPEAT)
     {
@@ -192,7 +150,7 @@ _gtk_theming_background_paint_layer (GtkThemingBackground *bg,
                        _gtk_css_position_value_get_x (pos, width - image_width),
                        _gtk_css_position_value_get_y (pos, height - image_height));
       /* shortcut for normal case */
-      _gtk_css_image_draw (layer->image, cr, image_width, image_height);
+      _gtk_css_image_draw (image, cr, image_width, image_height);
     }
   else
     {
@@ -265,7 +223,7 @@ _gtk_theming_background_paint_layer (GtkThemingBackground *bg,
       cairo_translate (cr2,
                        0.5 * (surface_width - image_width),
                        0.5 * (surface_height - image_height));
-      _gtk_css_image_draw (layer->image, cr2, image_width, image_height);
+      _gtk_css_image_draw (image, cr2, image_width, image_height);
       cairo_destroy (cr2);
 
       cairo_set_source_surface (cr, surface,
@@ -301,6 +259,7 @@ _gtk_theming_background_paint_layer (GtkThemingBackground *bg,
       cairo_fill (cr);
     }
 
+
   cairo_restore (cr);
 }
 
@@ -313,29 +272,15 @@ _gtk_theming_background_apply_shadow (GtkThemingBackground *bg,
                                     &bg->padding_box);
 }
 
-static void
-_gtk_theming_background_init_layer (GtkThemingBackground *bg,
-                                    GtkThemingBackgroundLayer *layer,
-                                    GtkCssValue *background_image,
-                                    gint idx)
-{
-  layer->idx = idx;
-  layer->clip_box = bg->border_box;
-
-  _gtk_theming_background_layer_apply_clip (bg, layer);
-  _gtk_theming_background_layer_apply_origin (bg, layer);
-
-  layer->image = _gtk_css_image_value_get_image (_gtk_css_array_value_get_nth (background_image, layer->idx));
-}
-
 static void
 _gtk_theming_background_init_context (GtkThemingBackground *bg)
 {
-  bg->flags = gtk_style_context_get_state (bg->context);
+  GtkStateFlags flags = gtk_style_context_get_state (bg->context);
+  GtkBorder border, padding;
 
-  gtk_style_context_get_border (bg->context, bg->flags, &bg->border);
-  gtk_style_context_get_padding (bg->context, bg->flags, &bg->padding);
-  gtk_style_context_get_background_color (bg->context, bg->flags, &bg->bg_color);
+  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
    * the padding-box, i.e. all the border-box minus the borders themselves,
@@ -350,8 +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,
+                          padding.top, padding.right,
+                          padding.bottom, padding.left);
 }
 
 void
@@ -401,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);
@@ -413,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, background_image, idx);
-      _gtk_theming_background_paint_layer (bg, &layer, cr);
+      _gtk_theming_background_paint_layer (bg, idx, cr);
     }
 
   _gtk_theming_background_apply_shadow (bg, cr);