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

LibGUI: Move GUI::SettingsWindow setup out of the constructor

Browse source 
In order to propagate errors that occur during UI setup, we have to move
all that logic out of widget/window subclass constructors. This is a
first attempt at doing that, for GUI::SettingsWindow.
This commit is contained in:
Andreas Kling 2021-11-28 08:34:04 +01:00
parent 56c4f0aff5
commit 60c132d7d3
8 changed files with 48 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/BrowserSettings/main.cpp
View file

@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-browser"); auto app_icon = GUI::Icon::default_icon("app-browser");
auto window = TRY(GUI::SettingsWindow::try_create("Browser Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); auto window = TRY(GUI::SettingsWindow::create("Browser Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
TRY(window->add_tab<BrowserSettingsWidget>("Browser")); TRY(window->add_tab<BrowserSettingsWidget>("Browser"));

2
Userland/Applications/DisplaySettings/main.cpp
View file

@ -26,7 +26,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-display-settings"); auto app_icon = GUI::Icon::default_icon("app-display-settings");
auto window = TRY(GUI::SettingsWindow::try_create("Display Settings")); auto window = TRY(GUI::SettingsWindow::create("Display Settings"));
TRY(window->add_tab<DisplaySettings::BackgroundSettingsWidget>("Background")); TRY(window->add_tab<DisplaySettings::BackgroundSettingsWidget>("Background"));
TRY(window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts")); TRY(window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts"));
TRY(window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor")); TRY(window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor"));

2
Userland/Applications/KeyboardSettings/main.cpp
View file

@ -29,7 +29,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-keyboard-settings"); auto app_icon = GUI::Icon::default_icon("app-keyboard-settings");
auto window = TRY(GUI::SettingsWindow::try_create("Keyboard Settings")); auto window = TRY(GUI::SettingsWindow::create("Keyboard Settings"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
TRY(window->add_tab<KeyboardSettingsWidget>("Keyboard")); TRY(window->add_tab<KeyboardSettingsWidget>("Keyboard"));

2
Userland/Applications/MailSettings/main.cpp
View file

@ -27,7 +27,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-mail"); auto app_icon = GUI::Icon::default_icon("app-mail");
auto window = GUI::SettingsWindow::construct("Mail Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes); auto window = TRY(GUI::SettingsWindow::create("Mail Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
TRY(window->add_tab<MailSettingsWidget>("Mail")); TRY(window->add_tab<MailSettingsWidget>("Mail"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));

2
Userland/Applications/MouseSettings/main.cpp
View file

@ -25,7 +25,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-mouse"); auto app_icon = GUI::Icon::default_icon("app-mouse");
auto window = TRY(GUI::SettingsWindow::try_create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); auto window = TRY(GUI::SettingsWindow::create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
TRY(window->add_tab<MouseWidget>("Mouse")); TRY(window->add_tab<MouseWidget>("Mouse"));
TRY(window->add_tab<ThemeWidget>("Cursor Theme")); TRY(window->add_tab<ThemeWidget>("Cursor Theme"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));

2
Userland/Applications/TerminalSettings/main.cpp
View file

@ -26,7 +26,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-terminal"); auto app_icon = GUI::Icon::default_icon("app-terminal");
auto window = TRY(GUI::SettingsWindow::try_create("Terminal Settings")); auto window = TRY(GUI::SettingsWindow::create("Terminal Settings"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
TRY(window->add_tab<TerminalSettingsMainWidget>("Terminal")); TRY(window->add_tab<TerminalSettingsMainWidget>("Terminal"));
TRY(window->add_tab<TerminalSettingsViewWidget>("View")); TRY(window->add_tab<TerminalSettingsViewWidget>("View"));

70
Userland/Libraries/LibGUI/SettingsWindow.cpp
View file

@ -15,60 +15,68 @@
namespace GUI { namespace GUI {
SettingsWindow::SettingsWindow(StringView title, ShowDefaultsButton show_defaults_button) ErrorOr<NonnullRefPtr<SettingsWindow>> SettingsWindow::create(String title, ShowDefaultsButton show_defaults_button)
{ {
set_title(title); auto window = TRY(SettingsWindow::try_create());
resize(400, 480);
set_resizable(false);
set_minimizable(false);
auto& main_widget = set_main_widget<GUI::Widget>(); window->set_title(move(title));
main_widget.set_fill_with_background_color(true); window->resize(400, 480);
main_widget.set_layout<GUI::VerticalBoxLayout>(); window->set_resizable(false);
main_widget.layout()->set_margins(4); window->set_minimizable(false);
main_widget.layout()->set_spacing(6);
m_tab_widget = main_widget.add<GUI::TabWidget>(); auto main_widget = TRY(window->try_set_main_widget<GUI::Widget>());
main_widget->set_fill_with_background_color(true);
TRY(main_widget->try_set_layout<GUI::VerticalBoxLayout>());
main_widget->layout()->set_margins(4);
main_widget->layout()->set_spacing(6);
auto& button_container = main_widget.add<GUI::Widget>(); window->m_tab_widget = TRY(main_widget->try_add<GUI::TabWidget>());
button_container.set_shrink_to_fit(true);
button_container.set_layout<GUI::HorizontalBoxLayout>(); auto button_container = TRY(main_widget->try_add<GUI::Widget>());
button_container.layout()->set_spacing(6); button_container->set_shrink_to_fit(true);
TRY(button_container->try_set_layout<GUI::HorizontalBoxLayout>());
button_container->layout()->set_spacing(6);
if (show_defaults_button == ShowDefaultsButton::Yes) { if (show_defaults_button == ShowDefaultsButton::Yes) {
m_reset_button = button_container.add<GUI::Button>("Defaults"); window->m_reset_button = TRY(button_container->try_add<GUI::Button>("Defaults"));
m_reset_button->on_click = [&](auto) { window->m_reset_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
for (auto& tab : m_tabs) { for (auto& tab : window->m_tabs) {
tab.reset_default_values(); tab.reset_default_values();
tab.apply_settings(); tab.apply_settings();
} }
}; };
} }
button_container.layout()->add_spacer(); TRY(button_container->layout()->try_add_spacer());
m_ok_button = button_container.add<GUI::Button>("OK"); window->m_ok_button = TRY(button_container->try_add<GUI::Button>("OK"));
m_ok_button->set_fixed_width(75); window->m_ok_button->set_fixed_width(75);
m_ok_button->on_click = [&](auto) { window->m_ok_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
for (auto& tab : m_tabs) for (auto& tab : window->m_tabs)
tab.apply_settings(); tab.apply_settings();
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}; };
m_cancel_button = button_container.add<GUI::Button>("Cancel"); window->m_cancel_button = TRY(button_container->try_add<GUI::Button>("Cancel"));
m_cancel_button->set_fixed_width(75); window->m_cancel_button->set_fixed_width(75);
m_cancel_button->on_click = [&](auto) { window->m_cancel_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
for (auto& tab : m_tabs) for (auto& tab : window->m_tabs)
tab.cancel_settings(); tab.cancel_settings();
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}; };
m_apply_button = button_container.add<GUI::Button>("Apply"); window->m_apply_button = TRY(button_container->try_add<GUI::Button>("Apply"));
m_apply_button->set_fixed_width(75); window->m_apply_button->set_fixed_width(75);
m_apply_button->on_click = [&](auto) { window->m_apply_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) mutable {
for (auto& tab : m_tabs) for (auto& tab : window->m_tabs)
tab.apply_settings(); tab.apply_settings();
}; };
return window;
}
SettingsWindow::SettingsWindow()
{
} }
SettingsWindow::~SettingsWindow() SettingsWindow::~SettingsWindow()

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

@ -29,6 +29,8 @@ public:
No, No,
}; };
static ErrorOr<NonnullRefPtr<SettingsWindow>> create(String title, ShowDefaultsButton = ShowDefaultsButton::No);
virtual ~SettingsWindow() override; virtual ~SettingsWindow() override;
template<class T, class... Args> template<class T, class... Args>
@ -40,7 +42,7 @@ public:
} }
private: private:
SettingsWindow(StringView title, ShowDefaultsButton = ShowDefaultsButton::No); SettingsWindow();
RefPtr<GUI::TabWidget> m_tab_widget; RefPtr<GUI::TabWidget> m_tab_widget;
NonnullRefPtrVector<Tab> m_tabs; NonnullRefPtrVector<Tab> m_tabs;