From 00325e992bfa4adf45209ab0c35fc2bd0f217b2a Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 31 Jan 2012 18:33:37 -0500 Subject: 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 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gtk/gtkcombobox.c') 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; -- cgit v1.2.1