Commit 821365af authored by Cosimo Cecchi's avatar Cosimo Cecchi

combobox: move the allocation of the button contents box directly

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.
parent 93523e70
......@@ -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)
{
......
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