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

LibGUI: Port Menubar to new string

Browse source
This commit is contained in:
Karol Kosek 2023-04-16 11:42:18 +02:00 • committed by Andreas Kling
parent dccd70385d
commit 60a338758c
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibGUI/Menubar.cpp
View file

@ -16,16 +16,16 @@ ErrorOr<void> Menubar::try_add_menu(Badge<Window>, NonnullRefPtr<Menu> menu)
return {}; return {};
} }
ErrorOr<NonnullRefPtr<Menu>> Menubar::try_add_menu(Badge<Window>, DeprecatedString name) ErrorOr<NonnullRefPtr<Menu>> Menubar::try_add_menu(Badge<Window>, String name)
{ {
auto menu = TRY(try_add<Menu>(TRY(String::from_deprecated_string(name)))); auto menu = TRY(try_add<Menu>(move(name)));
TRY(m_menus.try_append(menu)); TRY(m_menus.try_append(menu));
return menu; return menu;
} }
Menu& Menubar::add_menu(Badge<Window>, DeprecatedString name) Menu& Menubar::add_menu(Badge<Window>, String name)
{ {
auto& menu = add<Menu>(String::from_deprecated_string(name).release_value_but_fixme_should_propagate_errors()); auto& menu = add<Menu>(move(name));
m_menus.append(menu); m_menus.append(menu);
return menu; return menu;
} }

4
Userland/Libraries/LibGUI/Menubar.h
View file

@ -23,8 +23,8 @@ public:
virtual ~Menubar() override = default; virtual ~Menubar() override = default;
ErrorOr<void> try_add_menu(Badge<Window>, NonnullRefPtr<Menu>); ErrorOr<void> try_add_menu(Badge<Window>, NonnullRefPtr<Menu>);
ErrorOr<NonnullRefPtr<Menu>> try_add_menu(Badge<Window>, DeprecatedString name); ErrorOr<NonnullRefPtr<Menu>> try_add_menu(Badge<Window>, String name);
Menu& add_menu(Badge<Window>, DeprecatedString name); Menu& add_menu(Badge<Window>, String name);
void for_each_menu(Function<IterationDecision(Menu&)>); void for_each_menu(Function<IterationDecision(Menu&)>);

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

@ -1326,7 +1326,7 @@ ErrorOr<void> Window::try_add_menu(NonnullRefPtr<Menu> menu)
ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(DeprecatedString name) ErrorOr<NonnullRefPtr<Menu>> Window::try_add_menu(DeprecatedString name)
{ {
auto menu = TRY(m_menubar->try_add_menu({}, move(name))); auto menu = TRY(m_menubar->try_add_menu({}, TRY(String::from_deprecated_string(name))));
if (m_window_id) { if (m_window_id) {
menu->realize_menu_if_needed(); menu->realize_menu_if_needed();
ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id()); ConnectionToWindowServer::the().async_add_menu(m_window_id, menu->menu_id());