[gtk+/wip/matthiasc/gadget] colorswatch: Keep consulting size request

[Matthias Clasen <matthiasc src gnome org>]

commit 97df445a10c5cf7e4f8e121894b51b479891a79b
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 7 09:40:53 2015 -0500

    colorswatch: Keep consulting size request
    
    GtkColorButton is using gtk_widget_set_size_request to make
    a text-height color swatch. Keep that working.

 gtk/gtkcolorswatch.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index 41f8992..f33f9a9 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -331,7 +331,7 @@ gtk_color_swatch_get_content_size (GtkCssGadget   *gadget,
 {
   GtkWidget *widget;
   GtkColorSwatch *swatch;
-  gint min;
+  gint w, h, min;
 
   widget = gtk_css_gadget_get_owner (gadget);
   swatch = GTK_COLOR_SWATCH (widget);
@@ -342,10 +342,11 @@ gtk_color_swatch_get_content_size (GtkCssGadget   *gadget,
                                      minimum, natural,
                                      NULL, NULL);
 
+  gtk_widget_get_size_request (widget, &w, &h);
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    min = 48;
+    min = w < 0 ? 48 : w;
   else
-    min = 32;
+    min = h < 0 ? 32 : h;
 
   *minimum = MAX (*minimum, min);
   *natural = MAX (*natural, min);