RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 17:52:45 +00:00
Code Issues Activity Actions

Revert "WSWindowServer: Remove uneccessary special casing"

Browse source 
This reverts commit 0c1bc91e88.

It turns out this is what made it possible to hover "between" different
menus after opening one of them with a click.
This commit is contained in:
Andreas Kling 2020-01-08 13:13:08 +01:00
parent fe1bf067b8
commit 50fa759806
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Servers/WindowServer/WSWindowManager.cpp
View file

@ -708,6 +708,12 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere
deliver_mouse_event(*window, translated_event);
}
// FIXME: Now that the menubar has a dedicated window, is this special-casing really necessary?
if (!active_window_is_modal() && menubar_rect().contains(event.position())) {
m_menu_manager.dispatch_event(event);
return;
}
if (!menu_manager().open_menu_stack().is_empty()) {
auto* topmost_menu = menu_manager().open_menu_stack().last().ptr();
ASSERT(topmost_menu);