From 3f35cd2f7d9ca60188b3b057cdb2ba23f050d745 Mon Sep 17 00:00:00 2001 From: Shannon Booth Date: Tue, 7 Jan 2020 21:44:10 +1300 Subject: [PATCH] WSWindowServer: Only close menubar on a mouse down This allows you to click on the menu, then use the menu keys to browse the menu. Beforehand, you would click the window, release the button, and the menu would close :( --- Servers/WindowServer/WSWindowManager.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp index 9ab3a01e16..c913bd3e45 100644 --- a/Servers/WindowServer/WSWindowManager.cpp +++ b/Servers/WindowServer/WSWindowManager.cpp @@ -733,8 +733,11 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere return; } } - m_menu_manager.close_bar(); - topmost_menu->set_window_menu_open(false); + + if (event.type() == WSEvent::MouseDown) { + m_menu_manager.close_bar(); + topmost_menu->set_window_menu_open(false); + } } if (event.type() == WSEvent::MouseMove) {