Commit 00325e99 authored by Cosimo Cecchi's avatar Cosimo Cecchi

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.
parent c598a950
...@@ -2560,7 +2560,6 @@ gtk_combo_box_size_allocate (GtkWidget *widget, ...@@ -2560,7 +2560,6 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
gint width; gint width;
guint border_width; guint border_width;
gtk_widget_size_allocate (priv->button, allocation);
/* menu mode */ /* menu mode */
allocation->x += padding.left; allocation->x += padding.left;
...@@ -2571,6 +2570,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget, ...@@ -2571,6 +2570,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
/* set some things ready */ /* set some things ready */
border_width = gtk_container_get_border_width (GTK_CONTAINER (priv->button)); border_width = gtk_container_get_border_width (GTK_CONTAINER (priv->button));
get_widget_padding_and_border (priv->button, &button_padding); get_widget_padding_and_border (priv->button, &button_padding);
gtk_widget_size_allocate (priv->button, allocation);
child.x = allocation->x; child.x = allocation->x;
child.y = allocation->y; child.y = allocation->y;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment