Queue the resize before setting the tearoff state, to make sure the

2004-11-05  Matthias Clasen  <mclasen@redhat.com>

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

diff --git a/ChangeLog b/ChangeLog
index a2699eca1d741c521177da3926ff6da61eb961ca..dc354e7a6a5a8bb2706399356fd4ee03a1eebd98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 a2699eca1d741c521177da3926ff6da61eb961ca..dc354e7a6a5a8bb2706399356fd4ee03a1eebd98 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 a2699eca1d741c521177da3926ff6da61eb961ca..dc354e7a6a5a8bb2706399356fd4ee03a1eebd98 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 a2699eca1d741c521177da3926ff6da61eb961ca..dc354e7a6a5a8bb2706399356fd4ee03a1eebd98 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2004-11-05  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 30c81873e102e92ecd50e179d70fb1cb409c8539..375005de7464750d5d50d2962e88f85df863b4b0 100644 (file)
--- 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