AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

menubar: compute in advance wether to add toggle size

Browse Source
This commit is contained in:
Benjamin Otte 2011-04-30 06:16:18 +02:00
parent f2bf5ce378
commit 5aac83bf08
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkmenubar.c
View File

@ -305,6 +305,7 @@ gtk_menu_bar_size_request (GtkWidget *widget,
GtkRequisition requisition;
gint ipadding;
guint border_width;
gboolean use_toggle_size;
requisition.width = 0;
requisition.height = 0;
@ -315,6 +316,12 @@ gtk_menu_bar_size_request (GtkWidget *widget,
children = menu_shell->priv->children;
if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
use_toggle_size = (orientation == GTK_ORIENTATION_HORIZONTAL);
else
use_toggle_size = (orientation == GTK_ORIENTATION_VERTICAL);
while (children)
{
child = children->data;
@ -322,17 +329,18 @@ gtk_menu_bar_size_request (GtkWidget *widget,
if (gtk_widget_get_visible (child))
{
gint toggle_size;
gtk_widget_get_preferred_size (child, &child_requisition, NULL);
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
if (priv->child_pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->child_pack_direction == GTK_PACK_DIRECTION_RTL)
child_requisition.width += toggle_size;
else
child_requisition.height += toggle_size;
if (use_toggle_size)
{
gint toggle_size;
gtk_menu_item_toggle_size_request (GTK_MENU_ITEM (child),
&toggle_size);
child_requisition.width += toggle_size;
child_requisition.height += toggle_size;
}
if (priv->pack_direction == GTK_PACK_DIRECTION_LTR ||
priv->pack_direction == GTK_PACK_DIRECTION_RTL)