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

WindowServer: Remove the global app menu

Browse source 
The SetApplicationMenu IPC message is still there, since we also need
to clean up all of the client code before we can remove that.
This commit is contained in:
Andreas Kling 2021-03-25 21:19:05 +01:00
parent 05cc7d69ac
commit fcc8e3484f
6 changed files with 3 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Services/WindowServer/ClientConnection.cpp
View file

@ -117,8 +117,6 @@ OwnPtr<Messages::WindowServer::DestroyMenubarResponse> ClientConnection::handle(
did_misbehave("DestroyMenubar: Bad menubar ID");
return {};
}
auto& menubar = *(*it).value;
MenuManager::the().close_menubar(menubar);
m_menubars.remove(it);
return make<Messages::WindowServer::DestroyMenubarResponse>();
}
@ -146,17 +144,8 @@ OwnPtr<Messages::WindowServer::DestroyMenuResponse> ClientConnection::handle(con
return make<Messages::WindowServer::DestroyMenuResponse>();
}
OwnPtr<Messages::WindowServer::SetApplicationMenubarResponse> ClientConnection::handle(const Messages::WindowServer::SetApplicationMenubar& message)
OwnPtr<Messages::WindowServer::SetApplicationMenubarResponse> ClientConnection::handle(const Messages::WindowServer::SetApplicationMenubar&)
{
int menubar_id = message.menubar_id();
auto it = m_menubars.find(menubar_id);
if (it == m_menubars.end()) {
did_misbehave("SetApplicationMenubar: Bad menubar ID");
return {};
}
auto& menubar = *(*it).value;
m_app_menubar = menubar.make_weak_ptr();
WindowManager::the().notify_client_changed_app_menubar(*this);
return make<Messages::WindowServer::SetApplicationMenubarResponse>();
}