summaryrefslogtreecommitdiff
path: root/openbox/menuframe.h
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-01-04 15:07:10 -0500
committerDana Jansens <danakj@orodu.net>2010-01-06 17:13:03 -0500
commitb88cf22bc0084bc611453443b5d8355edbe33bfa (patch)
tree65814bef5a14262548df071664d03fcbfb2c775e /openbox/menuframe.h
parent8968b38338529cd0a7f2ad08a7c2e0d2e76b6e62 (diff)
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
Diffstat (limited to 'openbox/menuframe.h')
-rw-r--r--openbox/menuframe.h4
1 files changed, 1 insertions, 3 deletions
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