diff --git a/ChangeLog b/ChangeLog index e9ad6c80c3..9a3a22cfe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Apr 25 20:24:37 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's + requisition.height, not allocation.height, as width of submenu + indicator. (#75948) + Thu Apr 25 00:26:34 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e9ad6c80c3..9a3a22cfe0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Apr 25 20:24:37 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's + requisition.height, not allocation.height, as width of submenu + indicator. (#75948) + Thu Apr 25 00:26:34 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e9ad6c80c3..9a3a22cfe0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Apr 25 20:24:37 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's + requisition.height, not allocation.height, as width of submenu + indicator. (#75948) + Thu Apr 25 00:26:34 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e9ad6c80c3..9a3a22cfe0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Apr 25 20:24:37 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's + requisition.height, not allocation.height, as width of submenu + indicator. (#75948) + Thu Apr 25 00:26:34 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e9ad6c80c3..9a3a22cfe0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Apr 25 20:24:37 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's + requisition.height, not allocation.height, as width of submenu + indicator. (#75948) + Thu Apr 25 00:26:34 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e9ad6c80c3..9a3a22cfe0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Apr 25 20:24:37 2002 Soeren Sandmann + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): use the child's + requisition.height, not allocation.height, as width of submenu + indicator. (#75948) + Thu Apr 25 00:26:34 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_reset_default_sort_func): diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 552c0f0498..dfb753169f 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -497,6 +497,8 @@ gtk_menu_item_size_allocate (GtkWidget *widget, if (bin->child) { + GtkRequisition child_requisition; + child_allocation.x = (GTK_CONTAINER (widget)->border_width + widget->style->xthickness + BORDER_SPACING); @@ -508,9 +510,10 @@ gtk_menu_item_size_allocate (GtkWidget *widget, child_allocation.width -= GTK_MENU_ITEM (widget)->toggle_size; child_allocation.x += widget->allocation.x; child_allocation.y += widget->allocation.y; - + + gtk_widget_get_child_requisition (bin->child, &child_requisition); if (menu_item->submenu && menu_item->show_submenu_indicator) - child_allocation.width -= child_allocation.height; + child_allocation.width -= child_requisition.height; gtk_widget_size_allocate (bin->child, &child_allocation); }