Revert "A fix for delayed hiding of submenus."
authorDana Jansens <danakj@orodu.net>
Tue, 22 Dec 2009 14:31:24 +0000 (09:31 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 6 Jan 2010 02:44:39 +0000 (21:44 -0500)
This reverts commit 1fb198410e9d3ca660d91d1049249db0f2f47732.

openbox/event.c

index bbe7038..a0d26ab 100644 (file)
@@ -1838,7 +1838,8 @@ static gboolean event_handle_menu(XEvent *ev)
             break;
 
         if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) &&
             break;
 
         if ((e = g_hash_table_lookup(menu_frame_map, &ev->xcrossing.window)) &&
-            (f = find_active_menu()) && f->selected == e)
+            (f = find_active_menu()) && f->selected == e &&
+            e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
         {
             ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
                                                          ev->xcrossing.y_root);
         {
             ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
                                                          ev->xcrossing.y_root);