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

WindowServer: Let menu objects reference the WSClientConnection by pointer.

Browse source 
Since these are owner/ownee relationships, there's no need for indirection.
This commit is contained in:
Andreas Kling 2019-02-17 09:06:47 +01:00
parent 459cc23441
commit fa452fadca
6 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
WindowServer/WSMenu.cpp
View file

@ -9,8 +9,8 @@
#include <SharedGraphics/Painter.h>
#include <SharedGraphics/Font.h>
WSMenu::WSMenu(int client_id, int menu_id, String&& name)
: m_client_id(client_id)
WSMenu::WSMenu(WSClientConnection* client, int menu_id, String&& name)
: m_client(client)
, m_menu_id(menu_id)
, m_name(move(name))
{
@ -144,8 +144,8 @@ void WSMenu::did_activate(WSMenuItem& item)
message.menu.menu_id = m_menu_id;
message.menu.identifier = item.identifier();
if (auto* client = WSClientConnection::from_client_id(m_client_id))
client->post_message(message);
if (m_client)
m_client->post_message(message);
}
WSMenuItem* WSMenu::item_at(const Point& position)