diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-12-15 12:33:50 +0100 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-12-15 18:52:30 +0100 |
| commit | 20e94c1275c69886320860aad08e108c32c307bc (patch) | |
| tree | 4108fcb43027ffcd9f448bb28ae8af4cbc459b56 /gtk/gtkmenuitem.c | |
| parent | 3b0a9c59cc4a74b757ab536e77ab638ec055bbb8 (diff) | |
| download | gtk+-20e94c1275c69886320860aad08e108c32c307bc.tar.gz | |
menuitem: don't request twice the padding for separator menu items
Padding was requested twice for separator menu items.
https://bugzilla.gnome.org/show_bug.cgi?id=666242
Diffstat (limited to 'gtk/gtkmenuitem.c')
| -rw-r--r-- | gtk/gtkmenuitem.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index d801d8662b..46491474a4 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -941,11 +941,10 @@ gtk_menu_item_get_preferred_height (GtkWidget *widget, NULL); if (wide_separators) - min_height += separator_height + padding.top; - else - min_height += padding.top + padding.bottom; - - nat_height = min_height; + { + min_height += separator_height; + nat_height += separator_height; + } } accel_width = 0; @@ -1068,11 +1067,10 @@ gtk_menu_item_get_preferred_height_for_width (GtkWidget *widget, NULL); if (wide_separators) - min_height += separator_height + padding.top; - else - min_height += padding.top + padding.bottom; - - nat_height = min_height; + { + min_height += separator_height; + nat_height += separator_height; + } } if (minimum_size) |