summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-11-08 20:20:36 -0500
committerDana Jansens <danakj@orodu.net>2011-01-24 14:19:23 -0500
commit99ec7f6f7bc8a09a091de0d1ef81370bcd13887a (patch)
tree12b8c5600742ed821eabe78e409e01824b0f3a78
parent2e82715a4a53fbab6d359c76aa58581c4087ddaf (diff)
Fix regression: hitting a key accel in a menu didn't move focus to the submenu
-rw-r--r--openbox/event.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/openbox/event.c b/openbox/event.c
index ba39ef9f..2dde1329 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1945,8 +1945,15 @@ static gboolean event_handle_menu_input(XEvent *ev)
if (found) {
menu_frame_select(frame, found, TRUE);
- if (num_found == 1)
- frame->press_doexec = TRUE;
+ if (num_found == 1) {
+ if (found->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) {
+ /* move focus to the child menu */
+ menu_frame_select_next(frame->child);
+ }
+ else {
+ frame->press_doexec = TRUE;
+ }
+ }
ret = TRUE;
}
}