Shuffle the ordering around some more (position before realizing) fixing

Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>

        * 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)
This commit is contained in:
Owen Taylor 2002-03-26 19:59:34 +00:00 committed by Owen Taylor
parent c4e2102f3f
commit 441488cdb4
7 changed files with 47 additions and 3 deletions

View File

@ -1,3 +1,10 @@
Tue Mar 26 14:46:50 2002 Owen Taylor <otaylor@redhat.com>
* 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 <dave@ximian.com> 2002-03-26 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

View File

@ -1,3 +1,10 @@
Tue Mar 26 14:46:50 2002 Owen Taylor <otaylor@redhat.com>
* 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 <dave@ximian.com> 2002-03-26 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

View File

@ -1,3 +1,10 @@
Tue Mar 26 14:46:50 2002 Owen Taylor <otaylor@redhat.com>
* 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 <dave@ximian.com> 2002-03-26 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

View File

@ -1,3 +1,10 @@
Tue Mar 26 14:46:50 2002 Owen Taylor <otaylor@redhat.com>
* 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 <dave@ximian.com> 2002-03-26 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

View File

@ -1,3 +1,10 @@
Tue Mar 26 14:46:50 2002 Owen Taylor <otaylor@redhat.com>
* 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 <dave@ximian.com> 2002-03-26 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

View File

@ -1,3 +1,10 @@
Tue Mar 26 14:46:50 2002 Owen Taylor <otaylor@redhat.com>
* 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 <dave@ximian.com> 2002-03-26 Dave Camp <dave@ximian.com>
* gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

View File

@ -748,8 +748,12 @@ gtk_menu_popup (GtkMenu *menu,
*/ */
gtk_widget_show (GTK_WIDGET (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 /* Compute the size of the toplevel and realize it so we
* can position and scroll correctly. * can scroll correctly.
*/ */
{ {
GtkRequisition tmp_request; GtkRequisition tmp_request;
@ -765,8 +769,6 @@ gtk_menu_popup (GtkMenu *menu,
gtk_widget_realize (GTK_WIDGET (menu)); gtk_widget_realize (GTK_WIDGET (menu));
} }
gtk_menu_position (menu);
gtk_menu_scroll_to (menu, menu->scroll_offset); gtk_menu_scroll_to (menu, menu->scroll_offset);
/* Once everything is set up correctly, map the toplevel window on /* Once everything is set up correctly, map the toplevel window on