Fix regression: hitting a key accel in a menu didn't move focus to the submenu
authorDana Jansens <danakj@orodu.net>
Tue, 9 Nov 2010 01:20:36 +0000 (20:20 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 24 Jan 2011 19:19:23 +0000 (14:19 -0500)
openbox/event.c

index ba39ef9..2dde132 100644 (file)
@@ -1945,8 +1945,15 @@ static gboolean event_handle_menu_input(XEvent *ev)
                 if (found) {
                     menu_frame_select(frame, found, TRUE);
 
                 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;
                 }
             }
                     ret = TRUE;
                 }
             }