Revert "Fix the delayed hiding of submenus, so that they don't end up hidden while...
authorDana Jansens <danakj@orodu.net>
Tue, 22 Dec 2009 14:31:38 +0000 (09:31 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 6 Jan 2010 02:44:39 +0000 (21:44 -0500)
This reverts commit 8ada991d829671ab5e6dd4c5526b6a0238ba6a16.

openbox/menuframe.c

index 8177f51..3d2bf82 100644 (file)
@@ -1161,8 +1161,6 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
     }
 
     if (!entry && self->open_submenu) {
-        /* we moved out of the menu, so move the selection back to the open
-           submenu */
         entry = self->open_submenu;
         oldchild = NULL;
 
@@ -1180,16 +1178,12 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
         /* there is an open submenu */
 
         if (config_submenu_show_delay && !immediate) {
-            if (entry == self->open_submenu) {
-                /* we moved onto the entry that has an open submenu, so stop
-                   trying to close the submenu */
+            if (old == self->open_submenu) {
+                /* close the open submenu after a delay if we don't have
+                   it selected */
                 ob_main_loop_timeout_remove
                     (ob_main_loop,
                      menu_entry_frame_submenu_hide_timeout);
-            }
-            else if (old == self->open_submenu) {
-                /* we just moved off the entry with an open submenu, so
-                   close the open submenu after a delay */
                 ob_main_loop_timeout_add(ob_main_loop,
                                          config_submenu_show_delay * 1000,
                                          menu_entry_frame_submenu_hide_timeout,
@@ -1204,7 +1198,7 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
     if (self->selected) {
         menu_entry_frame_render(self->selected);
 
-        /* if we've selected a submenu and it wasn't already open, then
+        /* if we've selected a submenu and it wasn't always open, then
            show it */
         if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU &&
             self->selected != self->open_submenu)