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

LibGUI: Remove Menubar::try_add_menu()

Browse source 
And fall back to the infallible add_menu().
This commit is contained in:
Andreas Kling 2023-08-14 10:22:49 +02:00
parent 94cd272ac0
commit 5300896095
4 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibGUI/Window.cpp
View file

@ -1320,7 +1320,7 @@ Gfx::Bitmap* Window::back_bitmap()
ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
{
TRY(m_menubar->try_add_menu({}, move(menu)));
m_menubar->add_menu({}, move(menu));
if (m_window_id) {
menu->realize_menu_if_needed();
ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());
@ -1330,7 +1330,7 @@ ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(String name)
{
auto menu = TRY(m_menubar->try_add_menu({}, move(name)));
auto menu = m_menubar->add_menu({}, move(name));
if (m_window_id) {
menu->realize_menu_if_needed();
ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());