RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-20 18:05:07 +00:00
Code Issues Activity Actions

WindowServer: Rename WSMenuBarKeeper => WSMenuManager.

Browse source
This commit is contained in:
Andreas Kling 2019-07-18 08:32:44 +02:00
parent b907608e46
commit 66e9de8aaa
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Servers/WindowServer/WSWindowManager.cpp
View file

@ -102,7 +102,7 @@ WSWindowManager::WSWindowManager()
// NOTE: This ensures that the system menu has the correct dimensions.
set_current_menubar(nullptr);
m_menubar_keeper.setup();
m_menu_manager.setup();
invalidate();
WSCompositor::the().compose();
@ -239,7 +239,7 @@ void WSWindowManager::set_current_menubar(WSMenuBar* menubar)
++index;
return true;
});
m_menubar_keeper.refresh();
m_menu_manager.refresh();
}
void WSWindowManager::add_window(WSWindow& window)
@ -392,7 +392,7 @@ void WSWindowManager::close_current_menu()
if (m_current_menu && m_current_menu->menu_window())
m_current_menu->menu_window()->set_visible(false);
m_current_menu = nullptr;
m_menubar_keeper.refresh();
m_menu_manager.refresh();
}
void WSWindowManager::start_window_drag(WSWindow& window, const WSMouseEvent& event)
@ -682,7 +682,7 @@ void WSWindowManager::process_mouse_event(WSMouseEvent& event, WSWindow*& hovere
}
if (menubar_rect().contains(event.position())) {
m_menubar_keeper.event(event);
m_menu_manager.event(event);
return;
}
if (m_current_menu && m_current_menu->menu_window()) {
@ -987,7 +987,7 @@ void WSWindowManager::notify_client_changed_app_menubar(WSClientConnection& clie
{
if (active_client() == &client)
set_current_menubar(client.app_menubar());
m_menubar_keeper.refresh();
m_menu_manager.refresh();
}
const WSCursor& WSWindowManager::active_cursor() const