RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 23:17:45 +00:00
Code Issues Activity Actions

Userland: Make Window::set_main_widget() non-fallible

Browse source
This commit is contained in:
Tim Ledbetter 2023-09-19 01:13:48 +01:00 • committed by Andreas Kling
parent c9297126db
commit 3aa49f268c
120 changed files with 144 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,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->set_main_widget<GUI::Frame>());
m_root_container = m_slider_window->set_main_widget<GUI::Frame>();
m_root_container->set_fill_with_background_color(true);
m_root_container->set_layout<GUI::VerticalBoxLayout>(4, 0);
m_root_container->set_frame_style(Gfx::FrameStyle::Window);
@ -245,7 +245,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_title("Audio");
window->set_window_type(GUI::WindowType::Applet);
auto audio_widget = TRY(window->set_main_widget<AudioWidget>());
auto audio_widget = TRY(AudioWidget::try_create());
window->set_main_widget(audio_widget);
window->show();
// This affects the positioning, which depends on the window actually existing.

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

@ -43,7 +43,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->set_main_widget<GUI::TableView>());
auto table_view = main_window->set_main_widget<GUI::TableView>();
auto model = ClipboardHistoryModel::create();
TRY(model->read_from_file(clipboard_file_path));
@ -100,7 +100,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->set_main_widget<GUI::ImageWidget>());
auto icon_widget = applet_window->set_main_widget<GUI::ImageWidget>();
icon_widget->set_tooltip_deprecated("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

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

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

@ -187,7 +187,8 @@ 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->set_main_widget<NetworkWidget>(display_notifications));
auto icon = TRY(NetworkWidget::try_create(display_notifications));
window->set_main_widget(icon);
icon->load_from_file("/res/icons/16x16/network.png"sv);
window->resize(16, 16);
window->show();

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

@ -275,7 +275,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->set_main_widget<GraphWidget>(graph_type, graph_color, Optional<Gfx::Color> {}));
auto graph_widget = 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>().release_value_but_fixme_should_propagate_errors();
m_widget = set_main_widget<DesktopStatusWidget>();
}
void DesktopStatusWindow::wm_event(GUI::WMEvent& event)