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

LibGUI: Unbreak popup menus, now that invalid menus have ID -1.

Browse source
This commit is contained in:
Andreas Kling 2019-05-26 01:07:30 +02:00
parent 41ebb3eba3
commit 90dbf689c0
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
LibGUI/GMenu.cpp
View file

@ -3,6 +3,8 @@
#include <LibGUI/GEventLoop.h> #include <LibGUI/GEventLoop.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
//#define GMENU_DEBUG
static HashMap<int, GMenu*>& all_menus() static HashMap<int, GMenu*>& all_menus()
{ {
static HashMap<int, GMenu*>* map; static HashMap<int, GMenu*>* map;
@ -32,7 +34,9 @@ GMenu::~GMenu()
void GMenu::add_action(Retained<GAction> action) void GMenu::add_action(Retained<GAction> action)
{ {
m_items.append(make<GMenuItem>(m_menu_id, move(action))); m_items.append(make<GMenuItem>(m_menu_id, move(action)));
dbgprintf("MenuItem Menu ID: %d\n", m_menu_id); #ifdef GMENU_DEBUG
dbgprintf("GMenu::add_action(): MenuItem Menu ID: %d\n", m_menu_id);
#endif
} }
void GMenu::add_separator() void GMenu::add_separator()
@ -42,7 +46,7 @@ void GMenu::add_separator()
void GMenu::popup(const Point& screen_position) void GMenu::popup(const Point& screen_position)
{ {
if (!m_menu_id) if (m_menu_id == -1)
realize_menu(); realize_menu();
WSAPI_ClientMessage request; WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::PopupMenu; request.type = WSAPI_ClientMessage::Type::PopupMenu;
@ -53,7 +57,7 @@ void GMenu::popup(const Point& screen_position)
void GMenu::dismiss() void GMenu::dismiss()
{ {
if (!m_menu_id) if (m_menu_id == -1)
return; return;
WSAPI_ClientMessage request; WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::DismissMenu; request.type = WSAPI_ClientMessage::Type::DismissMenu;
@ -71,7 +75,9 @@ int GMenu::realize_menu()
auto response = GEventLoop::current().sync_request(request, WSAPI_ServerMessage::Type::DidCreateMenu); auto response = GEventLoop::current().sync_request(request, WSAPI_ServerMessage::Type::DidCreateMenu);
m_menu_id = response.menu.menu_id; m_menu_id = response.menu.menu_id;
dbgprintf("GMenu: Realizing menu! New menu ID: %d", m_menu_id); #ifdef GMENU_DEBUG
dbgprintf("GMenu::realize_menu(): New menu ID: %d\n", m_menu_id);
#endif
ASSERT(m_menu_id > 0); ASSERT(m_menu_id > 0);
for (int i = 0; i < m_items.size(); ++i) { for (int i = 0; i < m_items.size(); ++i) {
auto& item = *m_items[i]; auto& item = *m_items[i];
@ -81,7 +87,6 @@ int GMenu::realize_menu()
WSAPI_ClientMessage request; WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::AddMenuSeparator; request.type = WSAPI_ClientMessage::Type::AddMenuSeparator;
request.menu.menu_id = m_menu_id; request.menu.menu_id = m_menu_id;
dbgprintf("MenuItem [New] Menu ID: %d\n", m_menu_id);
GEventLoop::current().sync_request(request, WSAPI_ServerMessage::Type::DidAddMenuSeparator); GEventLoop::current().sync_request(request, WSAPI_ServerMessage::Type::DidAddMenuSeparator);
continue; continue;
} }
@ -117,7 +122,7 @@ int GMenu::realize_menu()
void GMenu::unrealize_menu() void GMenu::unrealize_menu()
{ {
if (!m_menu_id) if (m_menu_id == -1)
return; return;
all_menus().remove(m_menu_id); all_menus().remove(m_menu_id);
WSAPI_ClientMessage request; WSAPI_ClientMessage request;

10
LibGUI/GMenuBar.cpp
View file

@ -25,24 +25,24 @@ int GMenuBar::realize_menubar()
void GMenuBar::unrealize_menubar() void GMenuBar::unrealize_menubar()
{ {
if (!m_menubar_id) if (m_menubar_id == -1)
return; return;
WSAPI_ClientMessage request; WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::DestroyMenubar; request.type = WSAPI_ClientMessage::Type::DestroyMenubar;
request.menu.menubar_id = m_menubar_id; request.menu.menubar_id = m_menubar_id;
GEventLoop::current().sync_request(request, WSAPI_ServerMessage::Type::DidDestroyMenubar); GEventLoop::current().sync_request(request, WSAPI_ServerMessage::Type::DidDestroyMenubar);
m_menubar_id = 0; m_menubar_id = -1;
} }
void GMenuBar::notify_added_to_application(Badge<GApplication>) void GMenuBar::notify_added_to_application(Badge<GApplication>)
{ {
ASSERT(!m_menubar_id); ASSERT(m_menubar_id == -1);
m_menubar_id = realize_menubar(); m_menubar_id = realize_menubar();
ASSERT(m_menubar_id > 0); ASSERT(m_menubar_id != -1);
for (auto& menu : m_menus) { for (auto& menu : m_menus) {
ASSERT(menu); ASSERT(menu);
int menu_id = menu->realize_menu(); int menu_id = menu->realize_menu();
ASSERT(menu_id > 0); ASSERT(menu_id != -1);
WSAPI_ClientMessage request; WSAPI_ClientMessage request;
request.type = WSAPI_ClientMessage::Type::AddMenuToMenubar; request.type = WSAPI_ClientMessage::Type::AddMenuToMenubar;
request.menu.menubar_id = m_menubar_id; request.menu.menubar_id = m_menubar_id;

2
LibGUI/GMenuBar.h
View file

@ -20,6 +20,6 @@ private:
int realize_menubar(); int realize_menubar();
void unrealize_menubar(); void unrealize_menubar();
int m_menubar_id { 0 }; int m_menubar_id { -1 };
Vector<OwnPtr<GMenu>> m_menus; Vector<OwnPtr<GMenu>> m_menus;
}; };