diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-11-30 04:49:44 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-11-30 04:49:44 +0000 |
| commit | 4e67511f2a354c5af5c382775efaa8930d1c96bc (patch) | |
| tree | 8cf5ab67eca22c3080d6e0da98767dc50a2a945e /gtk/gtkmenushell.c | |
| parent | eec3339ff1bceb5ada216701aa17b940566e5d65 (diff) | |
| download | gdk-pixbuf-4e67511f2a354c5af5c382775efaa8930d1c96bc.tar.gz | |
Don't do the popup-on-click handling for menubars. (#159931, Søren
2004-11-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_button_release): Don't
do the popup-on-click handling for menubars. (#159931,
Søren Sandmann)
* gtk/gtkmenuitem.c (gtk_real_menu_item_select): Don't
handle popup delay if the submenu is already mapped.
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 0a7407836..4e1a664e1 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -508,10 +508,15 @@ gtk_menu_shell_button_release (GtkWidget *widget, _gtk_menu_item_is_selectable (menu_item)) { if (GTK_MENU_ITEM (menu_item)->submenu == NULL) - gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE); - else - gtk_menu_item_select (GTK_MENU_ITEM (menu_item)); - return TRUE; + { + gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE); + return TRUE; + } + else if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM) + { + gtk_menu_item_select (GTK_MENU_ITEM (menu_item)); + return TRUE; + } } else if (menu_item && !_gtk_menu_item_is_selectable (menu_item) && |