From 821365af15d6669cde9bd3cf68ed98d5bfcb652c Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 31 Jan 2012 15:34:00 -0500 Subject: [PATCH] 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. --- gtk/gtkcombobox.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index b10997dbc..d79e238c6 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -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) { -- 2.43.2