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
This commit is contained in:
Cosimo Cecchi 2011-12-15 12:33:50 +01:00
parent 3b0a9c59cc
commit 20e94c1275

View File

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