RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-31 18:27:34 +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

14
Userland/Services/LoginServer/LoginWindow.cpp
View file

@ -20,24 +20,24 @@ LoginWindow::LoginWindow(GUI::Window* parent)
set_closeable(false);
set_icon(GUI::Icon::default_icon("ladyball"sv).bitmap_for_size(16));
auto& widget = set_main_widget<GUI::Widget>();
widget.load_from_gml(login_window_gml);
m_banner = *widget.find_descendant_of_type_named<GUI::ImageWidget>("banner");
auto widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
widget->load_from_gml(login_window_gml);
m_banner = *widget->find_descendant_of_type_named<GUI::ImageWidget>("banner");
m_banner->load_from_file("/res/graphics/brand-banner.png"sv);
m_banner->set_auto_resize(true);
m_username = *widget.find_descendant_of_type_named<GUI::TextBox>("username");
m_username = *widget->find_descendant_of_type_named<GUI::TextBox>("username");
m_username->set_focus(true);
m_password = *widget.find_descendant_of_type_named<GUI::PasswordBox>("password");
m_password = *widget->find_descendant_of_type_named<GUI::PasswordBox>("password");
m_log_in_button = *widget.find_descendant_of_type_named<GUI::Button>("log_in");
m_log_in_button = *widget->find_descendant_of_type_named<GUI::Button>("log_in");
m_log_in_button->on_click = [&](auto) {
if (on_submit)
on_submit();
};
m_log_in_button->set_default(true);
m_fail_message = *widget.find_descendant_of_type_named<GUI::Label>("fail_message");
m_fail_message = *widget->find_descendant_of_type_named<GUI::Label>("fail_message");
m_username->on_change = [&] {
m_fail_message->set_text("");
};

14
Userland/Services/NotificationServer/NotificationWindow.cpp
View file

@ -67,20 +67,20 @@ NotificationWindow::NotificationWindow(i32 client_id, DeprecatedString const& te
m_original_rect = rect;
auto& widget = set_main_widget<GUI::Widget>();
auto widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
widget.set_fill_with_background_color(true);
widget.set_layout<GUI::HorizontalBoxLayout>();
widget.layout()->set_margins(8);
widget.layout()->set_spacing(6);
widget->set_fill_with_background_color(true);
widget->set_layout<GUI::HorizontalBoxLayout>();
widget->layout()->set_margins(8);
widget->layout()->set_spacing(6);
m_image = &widget.add<GUI::ImageWidget>();
m_image = &widget->add<GUI::ImageWidget>();
m_image->set_visible(icon.is_valid());
if (icon.is_valid()) {
m_image->set_bitmap(icon.bitmap());
}
auto& left_container = widget.add<GUI::Widget>();
auto& left_container = widget->add<GUI::Widget>();
left_container.set_layout<GUI::VerticalBoxLayout>();
m_title_label = &left_container.add<GUI::Label>(title);

22
Userland/Services/Taskbar/ClockWidget.cpp
View file

@ -40,14 +40,14 @@ ClockWidget::ClockWidget()
m_calendar_window->set_window_type(GUI::WindowType::Popup);
m_calendar_window->resize(m_window_size.width(), m_window_size.height());
auto& root_container = m_calendar_window->set_main_widget<GUI::Frame>();
root_container.set_fill_with_background_color(true);
root_container.set_layout<GUI::VerticalBoxLayout>();
root_container.layout()->set_margins({ 2, 0 });
root_container.layout()->set_spacing(0);
root_container.set_frame_shape(Gfx::FrameShape::Window);
auto root_container = m_calendar_window->set_main_widget<GUI::Frame>().release_value_but_fixme_should_propagate_errors();
root_container->set_fill_with_background_color(true);
root_container->set_layout<GUI::VerticalBoxLayout>();
root_container->layout()->set_margins({ 2, 0 });
root_container->layout()->set_spacing(0);
root_container->set_frame_shape(Gfx::FrameShape::Window);
auto& navigation_container = root_container.add<GUI::Widget>();
auto& navigation_container = root_container->add<GUI::Widget>();
navigation_container.set_fixed_height(24);
navigation_container.set_layout<GUI::HorizontalBoxLayout>();
navigation_container.layout()->set_margins({ 2 });
@ -109,10 +109,10 @@ ClockWidget::ClockWidget()
m_selected_calendar_button->set_text(m_calendar->formatted_date());
};
auto& separator1 = root_container.add<GUI::HorizontalSeparator>();
auto& separator1 = root_container->add<GUI::HorizontalSeparator>();
separator1.set_fixed_height(2);
auto& calendar_container = root_container.add<GUI::Widget>();
auto& calendar_container = root_container->add<GUI::Widget>();
calendar_container.set_layout<GUI::HorizontalBoxLayout>();
calendar_container.layout()->set_margins({ 2 });
@ -127,10 +127,10 @@ ClockWidget::ClockWidget()
m_selected_calendar_button->set_text(m_calendar->formatted_date());
};
auto& separator2 = root_container.add<GUI::HorizontalSeparator>();
auto& separator2 = root_container->add<GUI::HorizontalSeparator>();
separator2.set_fixed_height(2);
auto& settings_container = root_container.add<GUI::Widget>();
auto& settings_container = root_container->add<GUI::Widget>();
settings_container.set_fixed_height(24);
settings_container.set_layout<GUI::HorizontalBoxLayout>();
settings_container.layout()->set_margins({ 2 });

12
Userland/Services/Taskbar/ShutdownDialog.cpp
View file

@ -42,15 +42,15 @@ Vector<char const*> ShutdownDialog::show()
ShutdownDialog::ShutdownDialog()
: Dialog(nullptr)
{
auto& widget = set_main_widget<GUI::Widget>();
widget.set_fill_with_background_color(true);
widget.set_layout<GUI::VerticalBoxLayout>();
widget.layout()->set_spacing(0);
auto widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
widget->set_fill_with_background_color(true);
widget->set_layout<GUI::VerticalBoxLayout>();
widget->layout()->set_spacing(0);
auto& banner_image = widget.add<GUI::ImageWidget>();
auto& banner_image = widget->add<GUI::ImageWidget>();
banner_image.load_from_file("/res/graphics/brand-banner.png"sv);
auto& content_container = widget.add<GUI::Widget>();
auto& content_container = widget->add<GUI::Widget>();
content_container.set_layout<GUI::HorizontalBoxLayout>();
auto& left_container = content_container.add<GUI::Widget>();

2
Userland/Services/Taskbar/TaskbarWindow.cpp
View file

@ -72,7 +72,7 @@ TaskbarWindow::TaskbarWindow()
ErrorOr<void> TaskbarWindow::populate_taskbar()
{
auto main_widget = TRY(try_set_main_widget<TaskbarWidget>());
auto main_widget = TRY(set_main_widget<TaskbarWidget>());
(void)TRY(main_widget->try_set_layout<GUI::HorizontalBoxLayout>());
main_widget->layout()->set_margins({ 2, 3, 0, 3 });