summaryrefslogtreecommitdiff
path: root/openbox/event.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2014-11-05 09:58:57 +0100
committerMikael Magnusson <mikachu@gmail.com>2014-11-05 09:59:09 +0100
commit8944094f7164e2649a235fc699cc03b99355a0c8 (patch)
tree262bd27ed699c6ae41d0d6d99d4a2e7ea5e1e33b /openbox/event.c
parent28e85ea2b27100de4d737347b3460324d7e971e2 (diff)
Allow selecting menu entries during menuHideDelay if you click again, bug 5501
Diffstat (limited to 'openbox/event.c')
-rw-r--r--openbox/event.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/openbox/event.c b/openbox/event.c
index be42ddbf..5774f67d 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1836,8 +1836,14 @@ static gboolean event_handle_menu_input(XEvent *ev)
if ((e = menu_entry_frame_under(ev->xbutton.x_root,
ev->xbutton.y_root)))
{
- if (ev->type == ButtonPress && e->frame->child)
- menu_frame_select(e->frame->child, NULL, TRUE);
+ if (ev->type == ButtonPress) {
+ /* We know this is a new press, so we don't have to
+ * block release events anymore */
+ menu_hide_delay_reset();
+
+ if (e->frame->child)
+ menu_frame_select(e->frame->child, NULL, TRUE);
+ }
menu_frame_select(e->frame, e, TRUE);
if (ev->type == ButtonRelease)
menu_entry_frame_execute(e, ev->xbutton.state);