diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-22 09:31:38 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-05 21:44:39 -0500 |
| commit | 15802d87b18b8a7a741c2e8d80ab6e5f79ada13e (patch) | |
| tree | 7c6c06ba0ec615dfdcd87bdf0964b92b44b1cf5e /openbox | |
| parent | 775f60852a82930e870102a3b3b5a073c3ad6401 (diff) | |
Revert "Fix the delayed hiding of submenus, so that they don't end up hidden while the entry is selected"
This reverts commit 8ada991d829671ab5e6dd4c5526b6a0238ba6a16.
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/menuframe.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 8177f513..3d2bf829 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -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) |