[gtk+/wip/combobox-css-cleanups: 3/12] combobox: move the allocation of the button contents box directly

[Cosimo Cecchi <cosimoc src gnome org>]

commit 821365af15d6669cde9bd3cf68ed98d5bfcb652c
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 31 15:34:00 2012 -0500

    combobox: move the allocation of the button contents box directly
    
    If we're in menu mode with no children, instead of tweaking the
    allocation of the arrow and the separator separately, tweak the
    allocation of the box that contain both.

 gtk/gtkcombobox.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index b10997d..d79e238 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2585,22 +2585,13 @@ gtk_combo_box_size_allocate (GtkWidget     *widget,
             }
 
           /* handle the children */
-          gtk_widget_get_preferred_size (priv->arrow, &req, NULL);
+          gtk_widget_get_preferred_size (priv->box, &req, NULL);
           child.width = req.width;
           if (!is_rtl)
-            child.x += width - req.width - button_padding.right;
+            child.x += width - req.width;
           child.width = MAX (1, child.width);
           child.height = MAX (1, child.height);
-          gtk_widget_size_allocate (priv->arrow, &child);
-          if (is_rtl)
-            child.x += req.width;
-          gtk_widget_get_preferred_size (priv->separator, &req, NULL);
-          child.width = req.width;
-          if (!is_rtl)
-            child.x -= req.width;
-          child.width = MAX (1, child.width);
-          child.height = MAX (1, child.height);
-          gtk_widget_size_allocate (priv->separator, &child);
+          gtk_widget_size_allocate (priv->box, &child);
 
           if (is_rtl)
             {