summaryrefslogtreecommitdiff
path: root/gtk/gtkcombobox.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-01-31 18:33:37 -0500
committerCosimo Cecchi <cosimoc@gnome.org>2012-01-31 20:30:42 -0500
commit00325e992bfa4adf45209ab0c35fc2bd0f217b2a (patch)
tree13125ae72142d1dba49177bc2478a809dbd8da3e /gtk/gtkcombobox.c
parentc598a9501f33f55ac261292a57ce0b5cb23dcd91 (diff)
downloadgtk+-00325e992bfa4adf45209ab0c35fc2bd0f217b2a.tar.gz
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.
Diffstat (limited to 'gtk/gtkcombobox.c')
-rw-r--r--gtk/gtkcombobox.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bd7942fe13..bb6d8c4a76 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;