From cfb54d81bd0fbd25a4462a76f74c52d893294a2a Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Tue, 5 Apr 2011 22:36:24 -0400 Subject: [PATCH] combobox: allocate the right border to the arrow and not to the label When the combobox is in menu mode, the right padding of the togglebutton inside, should be allocated to its rightmost children, which is the arrow. https://bugzilla.gnome.org/show_bug.cgi?id=646882 --- gtk/gtkcombobox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index bcd169b8aa..dcf9af52ab 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -2449,7 +2449,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget, gtk_widget_get_preferred_size (priv->arrow, &req, NULL); child.width = req.width; if (!is_rtl) - child.x += width - req.width; + child.x += width - req.width - button_padding.right; child.width = MAX (1, child.width); child.height = MAX (1, child.height); gtk_widget_size_allocate (priv->arrow, &child); @@ -2467,7 +2467,7 @@ gtk_combo_box_size_allocate (GtkWidget *widget, { child.x += req.width; child.width = allocation->x + allocation->width - - (border_width + button_border.right + focus_width + focus_pad) + - (border_width + focus_width + focus_pad) - child.x; } else