projects
/
mikachu
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fix the delayed hiding of submenus, so that they don't end up hidden while...
[mikachu/openbox.git]
/
openbox
/
menuframe.c
diff --git
a/openbox/menuframe.c
b/openbox/menuframe.c
index
8177f51
..
3d2bf82
100644
(file)
--- 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) {
}
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;
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) {
/* 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);
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,
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 (self->selected) {
menu_entry_frame_render(self->selected);
- /* if we've selected a submenu and it wasn't al
ready
open, then
+ /* if we've selected a submenu and it wasn't al
ways
open, then
show it */
if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU &&
self->selected != self->open_submenu)
show it */
if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU &&
self->selected != self->open_submenu)