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

WindowServer: Detach WSMenuManager from WSWindowManager

Browse source 
You can now get to the WSMenuManager via WSMenuManager::the().
Also note that it's initialized after WSWindowManager.
This commit is contained in:
Andreas Kling 2020-01-08 13:19:31 +01:00
parent 2d75396c94
commit 8ddd053c2a
8 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Servers/WindowServer/WSWindowManager.h
View file

@ -94,9 +94,6 @@ public:
void draw_window_switcher();
WSMenuManager& menu_manager() { return m_menu_manager; }
const WSMenuManager& menu_manager() const { return m_menu_manager; }
Rect menubar_rect() const;
const WSCursor& active_cursor() const;
@ -259,7 +256,6 @@ private:
u8 m_keyboard_modifiers { 0 };
WSWindowSwitcher m_switcher;
WSMenuManager m_menu_manager;
WeakPtr<WSButton> m_cursor_tracking_button;
WeakPtr<WSButton> m_hovered_button;