From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Wed, 6 Apr 2011 02:36:24 +0000 (-0400)
Subject: combobox: allocate the right border to the arrow and not to the label
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=cfb54d81bd0fbd25a4462a76f74c52d893294a2a;p=~andy%2Fgtk

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
---

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bcd169b8a..dcf9af52a 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