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 881c9f8fa935d3e09c8b1179bd0463993a4232cf..d5791a034822f6236dd3d78ada0167d10d26fc71 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1841,7 +1841,12 @@ static gboolean event_handle_menu(XEvent *ev)
             (f = find_active_menu()) && f->selected == e &&
             e->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU)
         {
-            menu_frame_select(e->frame, NULL, FALSE);
+            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);
         }
         break;
     case MotionNotify: