revert my commit of d3th, it fucked up focus badly

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index f6d6f3b6f7a83eb3bd6cb595404e558604e98004..483050fa9b49498a4ee57f0e44ddcb084f095e61 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1181,6 +1181,16 @@ static void event_handle_menu(XEvent *ev)
                                             ev->xmotion.y_root)))
                 menu_frame_select(f, e);
         }
+        {
+            ObMenuFrame *a;
+
+            a = find_active_menu();
+            if (a && a != f &&
+                a->selected->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
+            {
+                menu_frame_select(a, NULL);
+            }
+        }
         break;
     case KeyPress:
         if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))