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

WindowServer: Move menu related code from WindowManager to MenuManager

Browse source 
Menus are now owned by menu manager instead of being split between the
window manager and menu manager. If the window server wants to change
a menu, or call menu related functionality, this will need to be done
through the menu manager.

Further refactoring is likely needed, but this seems like a good start
for seperating menu logic from window logic.
This commit is contained in:
Shannon Booth 2020-01-05 15:05:41 +13:00 • committed by Andreas Kling
parent adff54879c
commit 7557251fac
8 changed files with 250 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Servers/WindowServer/WSMenuItem.cpp
View file

@ -48,5 +48,5 @@ WSMenu* WSMenuItem::submenu()
ASSERT(is_submenu());
if (m_menu.client())
return m_menu.client()->find_menu_by_id(m_submenu_id);
return WSWindowManager::the().find_internal_menu_by_id(m_submenu_id);
return WSWindowManager::the().menu_manager().find_internal_menu_by_id(m_submenu_id);
}