From 441488cdb451acbe69c74417df7db7ed4a573091 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 26 Mar 2002 19:59:34 +0000 Subject: [PATCH] Shuffle the ordering around some more (position before realizing) fixing Tue Mar 26 14:46:50 2002 Owen Taylor * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around some more (position before realizing) fixing problems with arrows popping up at the wrong time (#73386), hopefully not introducing other problems. (Reported by Ettore Perrazoli, others) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkmenu.c | 8 +++++--- 7 files changed, 47 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9ed9bab00..8c323c19a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Mar 26 14:46:50 2002 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around + some more (position before realizing) fixing problems with + arrows popping up at the wrong time (#73386), hopefully not + introducing other problems. (Reported by Ettore Perrazoli, others) + 2002-03-26 Dave Camp * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f9ed9bab00..8c323c19a4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Mar 26 14:46:50 2002 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around + some more (position before realizing) fixing problems with + arrows popping up at the wrong time (#73386), hopefully not + introducing other problems. (Reported by Ettore Perrazoli, others) + 2002-03-26 Dave Camp * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f9ed9bab00..8c323c19a4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Mar 26 14:46:50 2002 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around + some more (position before realizing) fixing problems with + arrows popping up at the wrong time (#73386), hopefully not + introducing other problems. (Reported by Ettore Perrazoli, others) + 2002-03-26 Dave Camp * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f9ed9bab00..8c323c19a4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Mar 26 14:46:50 2002 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around + some more (position before realizing) fixing problems with + arrows popping up at the wrong time (#73386), hopefully not + introducing other problems. (Reported by Ettore Perrazoli, others) + 2002-03-26 Dave Camp * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f9ed9bab00..8c323c19a4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Mar 26 14:46:50 2002 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around + some more (position before realizing) fixing problems with + arrows popping up at the wrong time (#73386), hopefully not + introducing other problems. (Reported by Ettore Perrazoli, others) + 2002-03-26 Dave Camp * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f9ed9bab00..8c323c19a4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Mar 26 14:46:50 2002 Owen Taylor + + * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around + some more (position before realizing) fixing problems with + arrows popping up at the wrong time (#73386), hopefully not + introducing other problems. (Reported by Ettore Perrazoli, others) + 2002-03-26 Dave Camp * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 47db2b26bf..fd9caca9b2 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -748,8 +748,12 @@ gtk_menu_popup (GtkMenu *menu, */ gtk_widget_show (GTK_WIDGET (menu)); + /* Position the menu, possibly changing the size request + */ + gtk_menu_position (menu); + /* Compute the size of the toplevel and realize it so we - * can position and scroll correctly. + * can scroll correctly. */ { GtkRequisition tmp_request; @@ -765,8 +769,6 @@ gtk_menu_popup (GtkMenu *menu, gtk_widget_realize (GTK_WIDGET (menu)); } - gtk_menu_position (menu); - gtk_menu_scroll_to (menu, menu->scroll_offset); /* Once everything is set up correctly, map the toplevel window on