diff --git a/ChangeLog b/ChangeLog index a2699eca1d..dc354e7a6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-11-05 Matthias Clasen + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_activate): + Queue the resize before setting the tearoff state, to + make sure the torn-off menu picks up the size increase due + to the arrow in the torn off menu item. (#157286, Adam + Hooper, fix proposed by Owen Taylor) + * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily call gtk_menu_position(), since that function has issues when called on a menu whose parent is unrealized. (#157354, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a2699eca1d..dc354e7a6a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2004-11-05 Matthias Clasen + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_activate): + Queue the resize before setting the tearoff state, to + make sure the torn-off menu picks up the size increase due + to the arrow in the torn off menu item. (#157286, Adam + Hooper, fix proposed by Owen Taylor) + * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily call gtk_menu_position(), since that function has issues when called on a menu whose parent is unrealized. (#157354, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a2699eca1d..dc354e7a6a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,11 @@ 2004-11-05 Matthias Clasen + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_activate): + Queue the resize before setting the tearoff state, to + make sure the torn-off menu picks up the size increase due + to the arrow in the torn off menu item. (#157286, Adam + Hooper, fix proposed by Owen Taylor) + * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily call gtk_menu_position(), since that function has issues when called on a menu whose parent is unrealized. (#157354, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a2699eca1d..dc354e7a6a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2004-11-05 Matthias Clasen + * gtk/gtktearoffmenuitem.c (gtk_tearoff_menu_item_activate): + Queue the resize before setting the tearoff state, to + make sure the torn-off menu picks up the size increase due + to the arrow in the torn off menu item. (#157286, Adam + Hooper, fix proposed by Owen Taylor) + * gtk/gtkmenu.c (menu_change_screen): Don't unnecessarily call gtk_menu_position(), since that function has issues when called on a menu whose parent is unrealized. (#157354, diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index 30c81873e1..375005de74 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -249,11 +249,10 @@ gtk_tearoff_menu_item_activate (GtkMenuItem *menu_item) { GtkMenu *menu = GTK_MENU (GTK_WIDGET (menu_item)->parent); + gtk_widget_queue_resize (GTK_WIDGET (menu_item)); gtk_menu_set_tearoff_state (GTK_MENU (GTK_WIDGET (menu_item)->parent), !menu->torn_off); } - - gtk_widget_queue_resize (GTK_WIDGET (menu_item)); } static void