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

WindowServer: Un-nest MenuManager::handle_mouse_event() a bit

Browse source
This commit is contained in:
Andreas Kling 2021-04-01 09:10:07 +02:00
parent 77a601d52e
commit 3e3d196f06
1 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Services/WindowServer/MenuManager.cpp
View file

@ -171,7 +171,8 @@ void MenuManager::event(Core::Event& event)
void MenuManager::handle_mouse_event(MouseEvent& mouse_event) void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
{ {
if (has_open_menu()) { if (!has_open_menu())
return;
auto* topmost_menu = m_open_menu_stack.last().ptr(); auto* topmost_menu = m_open_menu_stack.last().ptr();
VERIFY(topmost_menu); VERIFY(topmost_menu);
auto* window = topmost_menu->menu_window(); auto* window = topmost_menu->menu_window();
@ -226,8 +227,6 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
break; break;
} }
} }
return;
}
} }
void MenuManager::close_all_menus_from_client(Badge<ClientConnection>, ClientConnection& client) void MenuManager::close_all_menus_from_client(Badge<ClientConnection>, ClientConnection& client)