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

combobox: move the allocation of the button contents box directly

Browse Source 
If we're in menu mode with no children, instead of tweaking the
allocation of the arrow and the separator separately, tweak the
allocation of the box that contain both.
This commit is contained in:
Cosimo Cecchi
2012-01-31 15:34:00 -05:00
parent 93523e70a0
commit 821365af15
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkcombobox.c
View File

@ -2585,22 +2585,13 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
}
/* handle the children */
gtk_widget_get_preferred_size (priv->arrow, &req, NULL);
gtk_widget_get_preferred_size (priv->box, &req, NULL);
child.width = req.width;
if (!is_rtl)
child.x += width - req.width - button_padding.right;
child.x += width - req.width;
child.width = MAX (1, child.width);
child.height = MAX (1, child.height);
gtk_widget_size_allocate (priv->arrow, &child);
if (is_rtl)
child.x += req.width;
gtk_widget_get_preferred_size (priv->separator, &req, NULL);
child.width = req.width;
if (!is_rtl)
child.x -= req.width;
child.width = MAX (1, child.width);
child.height = MAX (1, child.height);
gtk_widget_size_allocate (priv->separator, &child);
gtk_widget_size_allocate (priv->box, &child);
if (is_rtl)
{