summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2011-04-05 22:36:24 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2011-04-12 17:06:20 -0400
commite94b311fbfd1fd3d1cc5fd252ada45c9511d0854 (patch)
tree540cd3f7e2ef4d7f2b048ea5a5e9153584ea6dad
parent22eb1f5b91ef125fa41de6480e3709b27cf62a7e (diff)
downloadgtk+-e94b311fbfd1fd3d1cc5fd252ada45c9511d0854.tar.gz
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
-rw-r--r--gtk/gtkcombobox.c4
1 files 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