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/gtkmenuitem.c | |
| parent | eec3339ff1bceb5ada216701aa17b940566e5d65 (diff) | |
| download | gtk+-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/gtkmenuitem.c')
| -rw-r--r-- | gtk/gtkmenuitem.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index b1f25ffedc..9cff14b5c8 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -838,13 +838,15 @@ gtk_real_menu_item_select (GtkItem *item) menu_item = GTK_MENU_ITEM (item); - if (menu_item->submenu) + if (menu_item->submenu && + !GTK_WIDGET_MAPPED (menu_item->submenu)) { gint popup_delay; if (menu_item->timer) { g_source_remove (menu_item->timer); + menu_item->timer = 0; popup_delay = 0; } else |