projects
/
dana
/
openbox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't hog the user during the hideDelay
[dana/openbox.git]
/
openbox
/
event.c
diff --git
a/openbox/event.c
b/openbox/event.c
index
b59707b
..
8e0a6bb
100644
(file)
--- a/
openbox/event.c
+++ b/
openbox/event.c
@@
-1792,8
+1792,9
@@
static gboolean event_handle_menu_input(XEvent *ev)
if (ev->type == ButtonRelease || ev->type == ButtonPress) {
ObMenuEntryFrame *e;
if (ev->type == ButtonRelease || ev->type == ButtonPress) {
ObMenuEntryFrame *e;
- if (menu_hide_delay_reached() &&
- (ev->xbutton.button < 4 || ev->xbutton.button > 5))
+ if ((ev->xbutton.button < 4 || ev->xbutton.button > 5) &&
+ ((ev->type == ButtonRelease && menu_hide_delay_reached()) ||
+ ev->type == ButtonPress))
{
if ((e = menu_entry_frame_under(ev->xbutton.x_root,
ev->xbutton.y_root)))
{
if ((e = menu_entry_frame_under(ev->xbutton.x_root,
ev->xbutton.y_root)))
@@
-1804,7
+1805,7
@@
static gboolean event_handle_menu_input(XEvent *ev)
if (ev->type == ButtonRelease)
menu_entry_frame_execute(e, ev->xbutton.state);
}
if (ev->type == ButtonRelease)
menu_entry_frame_execute(e, ev->xbutton.state);
}
- else
if (ev->type == ButtonRelease)
+ else
menu_frame_hide_all();
}
ret = TRUE;
menu_frame_hide_all();
}
ret = TRUE;