RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 19:37:36 +00:00
Code Issues Activity Actions

WindowServer: Allow the system menu to be open when a modal is shown

Browse source
This commit is contained in:
angel 2020-04-21 16:46:32 +02:00 • committed by Andreas Kling
parent b9be57a9cd
commit 1032ae0140
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Servers/WindowServer/MenuManager.cpp
View file

@ -151,8 +151,9 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
bool handled_menubar_event = false; bool handled_menubar_event = false;
for_each_active_menubar_menu([&](Menu& menu) { for_each_active_menubar_menu([&](Menu& menu) {
if (menu.rect_in_menubar().contains(mouse_event.position())) { if (menu.rect_in_menubar().contains(mouse_event.position())) {
handle_menu_mouse_event(menu, mouse_event); handled_menubar_event = &menu == m_system_menu || !active_window || !active_window->is_modal();
handled_menubar_event = !active_window || !active_window->is_modal(); if (handled_menubar_event)
handle_menu_mouse_event(menu, mouse_event);
return IterationDecision::Break; return IterationDecision::Break;
} }
return IterationDecision::Continue; return IterationDecision::Continue;