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

WSMenuManager: On menu close, close the currently hovered menu item

Browse source 
Ensure that the current hover is not still hovered when the menu is
opened again.
This commit is contained in:
Shannon Booth 2020-01-03 14:09:12 +13:00 • committed by Andreas Kling
parent 0c1bc91e88
commit 27cb91e3e0
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/WindowServer/WSMenuManager.cpp
View file

@ -315,6 +315,7 @@ void WSMenuManager::close_everyone()
for (auto& menu : m_open_menu_stack) { for (auto& menu : m_open_menu_stack) {
if (menu && menu->menu_window()) if (menu && menu->menu_window())
menu->menu_window()->set_visible(false); menu->menu_window()->set_visible(false);
menu->clear_hovered_item();
} }
m_open_menu_stack.clear(); m_open_menu_stack.clear();
m_current_menu = nullptr; m_current_menu = nullptr;
@ -341,6 +342,7 @@ void WSMenuManager::close_menus(const Vector<WSMenu*>& menus)
m_current_menu = nullptr; m_current_menu = nullptr;
if (menu->menu_window()) if (menu->menu_window())
menu->menu_window()->set_visible(false); menu->menu_window()->set_visible(false);
menu->clear_hovered_item();
m_open_menu_stack.remove_first_matching([&](auto& entry) { m_open_menu_stack.remove_first_matching([&](auto& entry) {
return entry == menu; return entry == menu;
}); });