From 1032ae014053ccf5482b78465f02554165212ba9 Mon Sep 17 00:00:00 2001 From: angel Date: Tue, 21 Apr 2020 16:46:32 +0200 Subject: WindowServer: Allow the system menu to be open when a modal is shown --- Servers/WindowServer/MenuManager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Servers') diff --git a/Servers/WindowServer/MenuManager.cpp b/Servers/WindowServer/MenuManager.cpp index a0a1261770..2470d4f1fa 100644 --- a/Servers/WindowServer/MenuManager.cpp +++ b/Servers/WindowServer/MenuManager.cpp @@ -151,8 +151,9 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event) bool handled_menubar_event = false; for_each_active_menubar_menu([&](Menu& menu) { if (menu.rect_in_menubar().contains(mouse_event.position())) { - handle_menu_mouse_event(menu, mouse_event); - handled_menubar_event = !active_window || !active_window->is_modal(); + handled_menubar_event = &menu == m_system_menu || !active_window || !active_window->is_modal(); + if (handled_menubar_event) + handle_menu_mouse_event(menu, mouse_event); return IterationDecision::Break; } return IterationDecision::Continue; -- cgit v1.2.3