Revert "Don't hide submenus immediately when unselecting the parent's entry"

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index d5791a034822f6236dd3d78ada0167d10d26fc71..41f8eb16adf75b6b8ddeae3567356828b57a86c3 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1841,12 +1841,7 @@ static gboolean event_handle_menu(XEvent *ev)
             (f = find_active_menu()) && f->selected == e &&
             e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
         {
-            ObMenuEntryFrame *u = menu_entry_frame_under(ev->xcrossing.x_root,
-                                                         ev->xcrossing.y_root);
-            /* if we're just going from one entry in the menu to the next,
-               don't unselect stuff first */
-            if (!u || e->frame != u->frame)
-                menu_frame_select(e->frame, NULL, FALSE);
+            menu_frame_select(e->frame, NULL, FALSE);
         }
         break;
     case MotionNotify:
@@ -1918,9 +1913,6 @@ static gboolean focus_delay_func(gpointer data)
     ObFocusDelayData *d = data;
     Time old = event_curtime;
 
-    /* don't move focus and kill the menu or the move/resize */
-    if (menu_frame_visible || moveresize_in_progress) return FALSE;
-
     event_curtime = d->time;
     event_curserial = d->serial;
     if (client_focus(d->client) && config_focus_raise)