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

Flood: Propagate errors when creating SettingsDialog

Browse source
This commit is contained in:
implicitfield 2023-08-13 14:06:46 +03:00 • committed by Tim Schumacher
parent 239293a8b4
commit 8434b3a0c6
3 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Userland/Games/Flood/SettingsDialog.cpp
View file

@ -17,7 +17,15 @@
#include <LibGUI/Label.h> #include <LibGUI/Label.h>
#include <LibGUI/SpinBox.h> #include <LibGUI/SpinBox.h>
SettingsDialog::SettingsDialog(GUI::Window* parent, size_t board_rows, size_t board_columns) ErrorOr<NonnullRefPtr<SettingsDialog>> SettingsDialog::try_create(GUI::Window* parent, size_t board_rows, size_t board_columns)
{
auto settings_widget = GUI::Widget::construct();
TRY(settings_widget->load_from_gml(settings_dialog_gml));
auto settings_dialog = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) SettingsDialog(move(settings_widget), move(parent), move(board_rows), move(board_columns))));
return settings_dialog;
}
SettingsDialog::SettingsDialog(NonnullRefPtr<GUI::Widget> settings_widget, GUI::Window* parent, size_t board_rows, size_t board_columns)
: GUI::Dialog(parent) : GUI::Dialog(parent)
, m_board_rows(board_rows) , m_board_rows(board_rows)
, m_board_columns(board_columns) , m_board_columns(board_columns)
@ -27,29 +35,28 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, size_t board_rows, size_t bo
set_icon(parent->icon()); set_icon(parent->icon());
set_resizable(false); set_resizable(false);
auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors(); set_main_widget(settings_widget);
main_widget->load_from_gml(settings_dialog_gml).release_value_but_fixme_should_propagate_errors();
auto board_rows_spinbox = main_widget->find_descendant_of_type_named<GUI::SpinBox>("board_rows_spinbox"); auto board_rows_spinbox = settings_widget->find_descendant_of_type_named<GUI::SpinBox>("board_rows_spinbox");
board_rows_spinbox->set_value(m_board_rows); board_rows_spinbox->set_value(m_board_rows);
board_rows_spinbox->on_change = [&](auto value) { board_rows_spinbox->on_change = [&](auto value) {
m_board_rows = value; m_board_rows = value;
}; };
auto board_columns_spinbox = main_widget->find_descendant_of_type_named<GUI::SpinBox>("board_columns_spinbox"); auto board_columns_spinbox = settings_widget->find_descendant_of_type_named<GUI::SpinBox>("board_columns_spinbox");
board_columns_spinbox->set_value(m_board_columns); board_columns_spinbox->set_value(m_board_columns);
board_columns_spinbox->on_change = [&](auto value) { board_columns_spinbox->on_change = [&](auto value) {
m_board_columns = value; m_board_columns = value;
}; };
auto cancel_button = main_widget->find_descendant_of_type_named<GUI::Button>("cancel_button"); auto cancel_button = settings_widget->find_descendant_of_type_named<GUI::Button>("cancel_button");
cancel_button->on_click = [this](auto) { cancel_button->on_click = [this](auto) {
done(ExecResult::Cancel); done(ExecResult::Cancel);
}; };
auto ok_button = main_widget->find_descendant_of_type_named<GUI::Button>("ok_button"); auto ok_button = settings_widget->find_descendant_of_type_named<GUI::Button>("ok_button");
ok_button->on_click = [this](auto) { ok_button->on_click = [this](auto) {
done(ExecResult::OK); done(ExecResult::OK);
}; };

5
Userland/Games/Flood/SettingsDialog.h
View file

@ -10,13 +10,14 @@
#include <LibGUI/Dialog.h> #include <LibGUI/Dialog.h>
class SettingsDialog : public GUI::Dialog { class SettingsDialog : public GUI::Dialog {
C_OBJECT(SettingsDialog) C_OBJECT_ABSTRACT(SettingsDialog)
public: public:
static ErrorOr<NonnullRefPtr<SettingsDialog>> try_create(GUI::Window* parent, size_t board_rows, size_t board_columns);
size_t board_rows() const { return m_board_rows; } size_t board_rows() const { return m_board_rows; }
size_t board_columns() const { return m_board_columns; } size_t board_columns() const { return m_board_columns; }
private: private:
SettingsDialog(GUI::Window* parent, size_t board_rows, size_t board_columns); SettingsDialog(NonnullRefPtr<GUI::Widget> settings_widget, GUI::Window* parent, size_t board_rows, size_t board_columns);
size_t m_board_rows; size_t m_board_rows;
size_t m_board_columns; size_t m_board_columns;

8
Userland/Games/Flood/main.cpp
View file

@ -108,7 +108,13 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
update(); update();
auto change_settings = [&] { auto change_settings = [&] {
auto settings_dialog = SettingsDialog::construct(window, board_rows, board_columns); auto settings_dialog_or_error = SettingsDialog::try_create(window, board_rows, board_columns);
if (settings_dialog_or_error.is_error()) {
GUI::MessageBox::show(window, "Failed to load the settings window"sv, "Unable to Open Settings"sv, GUI::MessageBox::Type::Error);
return;
}
auto settings_dialog = settings_dialog_or_error.release_value();
if (settings_dialog->exec() != GUI::Dialog::ExecResult::OK) if (settings_dialog->exec() != GUI::Dialog::ExecResult::OK)
return; return;