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

LibGUI+Everywhere: Use fallible Window::set_main_widget() everywhere :^)

Browse source 
Rip that bandaid off!

This does the following, in one big, awkward jump:
- Replace all uses of `set_main_widget<Foo>()` with the `try` version.
- Remove `set_main_widget<Foo>()`.
- Rename the `try` version to just be `set_main_widget` because it's now
  the only one.

The majority of places that call `set_main_widget<Foo>()` are inside
constructors, so this unfortunately gives us a big batch of new
`release_value_but_fixme_should_propagate_errors()` calls.
This commit is contained in:
Sam Atkins 2023-01-06 16:48:37 +00:00 • committed by Andrew Kaster
parent d223477bc6
commit 0c24522635
121 changed files with 441 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applets/Audio/main.cpp
View file

@ -80,7 +80,7 @@ private:
m_slider_window = add<GUI::Window>(window());
m_slider_window->set_window_type(GUI::WindowType::Popup);
m_root_container = TRY(m_slider_window->try_set_main_widget<GUI::Frame>());
m_root_container = TRY(m_slider_window->set_main_widget<GUI::Frame>());
m_root_container->set_fill_with_background_color(true);
m_root_container->set_layout<GUI::VerticalBoxLayout>();
m_root_container->layout()->set_margins({ 4 });
@ -245,7 +245,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_title("Audio");
window->set_window_type(GUI::WindowType::Applet);
auto audio_widget = TRY(window->try_set_main_widget<AudioWidget>());
auto audio_widget = TRY(window->set_main_widget<AudioWidget>());
window->show();
// This positioning code depends on the window actually existing.

4
Userland/Applets/ClipboardHistory/main.cpp
View file

@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_window->set_rect(670, 65, 325, 500);
main_window->set_icon(app_icon.bitmap_for_size(16));
auto table_view = TRY(main_window->try_set_main_widget<GUI::TableView>());
auto table_view = TRY(main_window->set_main_widget<GUI::TableView>());
auto model = ClipboardHistoryModel::create();
table_view->set_model(model);
@ -65,7 +65,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
applet_window->set_title("ClipboardHistory");
applet_window->set_window_type(GUI::WindowType::Applet);
applet_window->set_has_alpha_channel(true);
auto icon_widget = TRY(applet_window->try_set_main_widget<GUI::ImageWidget>());
auto icon_widget = TRY(applet_window->set_main_widget<GUI::ImageWidget>());
icon_widget->set_tooltip("Clipboard History");
icon_widget->load_from_file("/res/icons/16x16/edit-copy.png"sv);
icon_widget->on_click = [&main_window = *main_window] {

2
Userland/Applets/Keymap/KeymapStatusWindow.cpp
View file

@ -14,7 +14,7 @@ KeymapStatusWindow::KeymapStatusWindow()
{
set_window_type(GUI::WindowType::Applet);
set_has_alpha_channel(true);
m_status_widget = &set_main_widget<KeymapStatusWidget>();
m_status_widget = set_main_widget<KeymapStatusWidget>().release_value_but_fixme_should_propagate_errors();
auto current_keymap = MUST(Keyboard::CharacterMap::fetch_system_map());
auto current_keymap_name = current_keymap.character_map_name();

2
Userland/Applets/Network/main.cpp
View file

@ -187,7 +187,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_window_type(GUI::WindowType::Applet);
window->set_has_alpha_channel(true);
window->resize(16, 16);
auto icon = TRY(window->try_set_main_widget<NetworkWidget>(display_notifications));
auto icon = TRY(window->set_main_widget<NetworkWidget>(display_notifications));
icon->load_from_file("/res/icons/16x16/network.png"sv);
window->resize(16, 16);
window->show();

2
Userland/Applets/ResourceGraph/main.cpp
View file

@ -276,7 +276,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_window_type(GUI::WindowType::Applet);
window->resize(GraphWidget::history_size + 2, 15);
auto graph_widget = TRY(window->try_set_main_widget<GraphWidget>(graph_type, graph_color, Optional<Gfx::Color> {}));
auto graph_widget = TRY(window->set_main_widget<GraphWidget>(graph_type, graph_color, Optional<Gfx::Color> {}));
window->show();
applet_windows.append(move(window));

2
Userland/Applets/WorkspacePicker/DesktopStatusWindow.cpp
View file

@ -148,7 +148,7 @@ DesktopStatusWindow::DesktopStatusWindow()
{
set_window_type(GUI::WindowType::Applet);
set_has_alpha_channel(true);
m_widget = &set_main_widget<DesktopStatusWidget>();
m_widget = set_main_widget<DesktopStatusWidget>().release_value_but_fixme_should_propagate_errors();
}
void DesktopStatusWindow::wm_event(GUI::WMEvent& event)