callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

combobox: make sure to respect the GtkComboBox padding in menu mode

Browse Source 
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.
This commit is contained in:
Cosimo Cecchi
2012-01-31 18:33:37 -05:00
parent c598a9501f
commit 00325e992b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcombobox.c
View File

@ -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,
/* 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;