WindowServer: Don't keep menu items in hovered state after the cursor leaves.

3 files changed, 16 insertions, 2 deletions

diff --git a/WindowServer/WSMenu.cpp b/WindowServer/WSMenu.cpp
index 505c4f35ab..0369e9bebf 100644
--- a/WindowServer/WSMenu.cpp
+++ b/WindowServer/WSMenu.cpp
@@ -114,12 +114,19 @@ void WSMenu::on_window_message(WSMessage& message)
         if (!m_hovered_item)
             return;
         did_activate(*m_hovered_item);
-        m_hovered_item = nullptr;
-        redraw();
+        clear_hovered_item();
         return;
     }
 }
 
+void WSMenu::clear_hovered_item()
+{
+    if (!m_hovered_item)
+        return;
+    m_hovered_item = nullptr;
+    redraw();
+}
+
 void WSMenu::did_activate(WSMenuItem& item)
 {
     if (on_item_activation)
diff --git a/WindowServer/WSMenu.h b/WindowServer/WSMenu.h
index dc7adb4592..bc42eba5d3 100644
--- a/WindowServer/WSMenu.h
+++ b/WindowServer/WSMenu.h
@@ -57,6 +57,9 @@ public:
     WSMenuItem* item_at(const Point&);
     void redraw();
 
+    const WSMenuItem* hovered_item() const { return m_hovered_item; }
+    void clear_hovered_item();
+
     Function<void(WSMenuItem&)> on_item_activation;
 
 private:
diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp
index 1ea94c30d8..cfba1fdda2 100644
--- a/WindowServer/WSWindowManager.cpp
+++ b/WindowServer/WSWindowManager.cpp
@@ -485,6 +485,10 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event)
         return;
     }
 
+    if (m_current_menu && m_current_menu->hovered_item() && !m_current_menu->menu_window()->rect().contains(event.position())) {
+        m_current_menu->clear_hovered_item();
+    }
+
     // FIXME: Figure out an automatic menu dismissal logic that feels right.
 #if 0
     if (m_current_menu && event.type() == WSMouseEvent::MouseUp && event.button() == MouseButton::Left)