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

WindowServer: Don't ignore mouse events after showing modal window (#1495)

Browse source 
Fixes #1464
This commit is contained in:
Alex Muscar 2020-03-25 15:26:33 +00:00 • committed by GitHub
parent 30649ed93f
commit fefc2665d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Servers/WindowServer/MenuManager.cpp
View file

@ -120,8 +120,14 @@ void MenuManager::refresh()
void MenuManager::event(Core::Event& event) void MenuManager::event(Core::Event& event)
{ {
if (WindowManager::the().active_window_is_modal()) auto* active_window = WindowManager::the().active_window();
return Core::Object::event(event); if (active_window && active_window->is_modal() && has_open_menu()) {
auto* topmost_menu = m_open_menu_stack.last().ptr();
ASSERT(topmost_menu);
// Always allow window menu interaction, even while a modal window is active.
if (!topmost_menu->window_menu_of())
return Core::Object::event(event);
}
if (static_cast<Event&>(event).is_mouse_event()) { if (static_cast<Event&>(event).is_mouse_event()) {
handle_mouse_event(static_cast<MouseEvent&>(event)); handle_mouse_event(static_cast<MouseEvent&>(event));