[gtk+/wip/combobox-css-cleanups: 6/12] combobox: make sure to respect the GtkComboBox padding in menu mode



commit 70235372f44d71054501da9b6a27dadab00dbab0
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Jan 31 18:33:37 2012 -0500

    combobox: make sure to respect the GtkComboBox padding in menu mode
    
    When the combobox is in menu mode, we still shouldn't discard the
    GtkComboBox padding value; it's wrong to allocate it to the button.

 gtk/gtkcombobox.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bd7942f..bb6d8c4 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -2560,7 +2560,6 @@ gtk_combo_box_size_allocate (GtkWidget     *widget,
           gint width;
           guint border_width;
 
-          gtk_widget_size_allocate (priv->button, allocation);
 
           /* menu mode */
           allocation->x += padding.left;
@@ -2571,6 +2570,7 @@ gtk_combo_box_size_allocate (GtkWidget     *widget,
           /* set some things ready */
           border_width = gtk_container_get_border_width (GTK_CONTAINER (priv->button));
           get_widget_padding_and_border (priv->button, &button_padding);
+          gtk_widget_size_allocate (priv->button, allocation);
 
           child.x = allocation->x;
           child.y = allocation->y;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]