From e04522772694682ccd11fc465d861b169675312b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 22 Dec 2009 09:31:50 -0500 Subject: Revert "Don't hide submenus immediately when unselecting the parent's entry" This reverts commit 828c095c8b5a2df96a38faaeb8a0df504e68e70f. --- openbox/menuframe.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'openbox/menuframe.h') diff --git a/openbox/menuframe.h b/openbox/menuframe.h index 624c3f49..1b1dcc70 100644 --- a/openbox/menuframe.h +++ b/openbox/menuframe.h @@ -53,9 +53,6 @@ struct _ObMenuFrame GList *entries; ObMenuEntryFrame *selected; - /* if a submenu was selected, then this holds the entry for that submenu - until it is closed */ - ObMenuEntryFrame *open_submenu; /* show entries from the menu starting at this index */ guint show_from; -- cgit v1.2.3 From 8968b38338529cd0a7f2ad08a7c2e0d2e76b6e62 Mon Sep 17 00:00:00 2001 From: Alexey Korop Date: Mon, 4 Jan 2010 13:21:12 -0500 Subject: improve submenu hide delay --- openbox/menuframe.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'openbox/menuframe.h') diff --git a/openbox/menuframe.h b/openbox/menuframe.h index 1b1dcc70..62df87ca 100644 --- a/openbox/menuframe.h +++ b/openbox/menuframe.h @@ -80,6 +80,9 @@ struct _ObMenuFrame menu until it has seen a KeyPress. this is to avoid having the keybinding used to show the menu end up running something inside the menu */ + ObMenuEntryFrame * submenu_to_hide; /* if exist (single!) submenu hide request + then this variable hold a copy of 'selected' field of the parent menu, + otherwice NULL */ }; struct _ObMenuEntryFrame -- cgit v1.2.3 From b88cf22bc0084bc611453443b5d8355edbe33bfa Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 4 Jan 2010 15:07:10 -0500 Subject: Some fixes for the submenu hide delay code When nothing in a menu is selected, go back to selecting the open submenu. Adjust the LeaveNotify event handling to only respond when there is not a EnterNotify coming for the same menu frame. Change the default submenu show/hide delays. Have the default values for submenu show/hide match the default rc.xml --- openbox/menuframe.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'openbox/menuframe.h') diff --git a/openbox/menuframe.h b/openbox/menuframe.h index 62df87ca..926b844e 100644 --- a/openbox/menuframe.h +++ b/openbox/menuframe.h @@ -50,6 +50,7 @@ struct _ObMenuFrame ObMenuFrame *parent; ObMenuEntryFrame *parent_entry; ObMenuFrame *child; + ObMenuEntryFrame *child_entry; GList *entries; ObMenuEntryFrame *selected; @@ -80,9 +81,6 @@ struct _ObMenuFrame menu until it has seen a KeyPress. this is to avoid having the keybinding used to show the menu end up running something inside the menu */ - ObMenuEntryFrame * submenu_to_hide; /* if exist (single!) submenu hide request - then this variable hold a copy of 'selected' field of the parent menu, - otherwice NULL */ }; struct _ObMenuEntryFrame -- cgit v1.2.3