beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-29 11:00:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibGUI: Don't show "Invalid" for menu items without a keyboard shortcut

Browse source
This commit is contained in:
Andreas Kling 2019-12-02 15:54:01 +01:00
parent d7177212fd
commit af9fd334f3
Notes: sideshowbarker 2024-07-19 10:59:20 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/af9fd334f3e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Libraries/LibGUI/GMenu.cpp
View file

@ -107,7 +107,8 @@ int GMenu::realize_menu()
}
icon_buffer_id = action.icon()->shared_buffer_id();
}
GWindowServerConnection::the().send_sync<WindowServer::AddMenuItem>(m_menu_id, i, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, action.shortcut().to_string(), icon_buffer_id);
auto shortcut_text = action.shortcut().is_valid() ? action.shortcut().to_string() : String();
GWindowServerConnection::the().send_sync<WindowServer::AddMenuItem>(m_menu_id, i, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, shortcut_text, icon_buffer_id);
}
}
all_menus().set(m_menu_id, this);

3
Libraries/LibGUI/GMenuItem.cpp
View file

@ -56,5 +56,6 @@ void GMenuItem::update_window_server()
if (m_menu_id < 0)
return;
auto& action = *m_action;
GWindowServerConnection::the().send_sync<WindowServer::UpdateMenuItem>(m_menu_id, m_identifier, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, action.shortcut().to_string());
auto shortcut_text = action.shortcut().is_valid() ? action.shortcut().to_string() : String();
GWindowServerConnection::the().send_sync<WindowServer::UpdateMenuItem>(m_menu_id, m_identifier, -1, action.text(), action.is_enabled(), action.is_checkable(), action.is_checkable() ? action.is_checked() : false, shortcut_text);
}