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

DisplaySettings: Propagate errors in EffectsSettingsWidget

Browse source
This commit is contained in:
implicitfield 2023-02-11 19:05:09 +02:00 • committed by Andreas Kling
parent 1c20cf7bee
commit 00be9eb210
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Applications/DisplaySettings/EffectsSettingsWidget.cpp
View file

@ -16,9 +16,16 @@ namespace GUI {
namespace DisplaySettings { namespace DisplaySettings {
EffectsSettingsWidget::EffectsSettingsWidget() ErrorOr<NonnullRefPtr<EffectsSettingsWidget>> EffectsSettingsWidget::try_create()
{ {
load_from_gml(effects_settings_gml).release_value_but_fixme_should_propagate_errors(); auto effects_settings_widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) EffectsSettingsWidget()));
TRY(effects_settings_widget->setup_interface());
return effects_settings_widget;
}
ErrorOr<void> EffectsSettingsWidget::setup_interface()
{
TRY(load_from_gml(effects_settings_gml));
m_geometry_combobox = find_descendant_of_type_named<ComboBox>("geometry_combobox"); m_geometry_combobox = find_descendant_of_type_named<ComboBox>("geometry_combobox");
m_geometry_combobox->set_only_allow_values_from_model(true); m_geometry_combobox->set_only_allow_values_from_model(true);
@ -29,7 +36,7 @@ EffectsSettingsWidget::EffectsSettingsWidget()
if (auto result = load_settings(); result.is_error()) { if (auto result = load_settings(); result.is_error()) {
warnln("Failed to load [Effects] from WindowServer.ini"); warnln("Failed to load [Effects] from WindowServer.ini");
return; return {};
} }
auto& animate_menus = *find_descendant_of_type_named<GUI::CheckBox>("animate_menus_checkbox"); auto& animate_menus = *find_descendant_of_type_named<GUI::CheckBox>("animate_menus_checkbox");
@ -92,6 +99,8 @@ EffectsSettingsWidget::EffectsSettingsWidget()
m_system_effects.effects().at(Effects::TooltipShadow) = checked; m_system_effects.effects().at(Effects::TooltipShadow) = checked;
set_modified(true); set_modified(true);
}; };
return {};
} }
ErrorOr<void> EffectsSettingsWidget::load_settings() ErrorOr<void> EffectsSettingsWidget::load_settings()

7
Userland/Applications/DisplaySettings/EffectsSettingsWidget.h
View file

@ -14,7 +14,9 @@ namespace GUI {
namespace DisplaySettings { namespace DisplaySettings {
class EffectsSettingsWidget final : public SettingsWindow::Tab { class EffectsSettingsWidget final : public SettingsWindow::Tab {
C_OBJECT(EffectsSettingsWidget); C_OBJECT_ABSTRACT(EffectsSettingsWidget);
static ErrorOr<NonnullRefPtr<EffectsSettingsWidget>> try_create();
public: public:
virtual ~EffectsSettingsWidget() override = default; virtual ~EffectsSettingsWidget() override = default;
@ -22,7 +24,8 @@ public:
virtual void apply_settings() override; virtual void apply_settings() override;
private: private:
EffectsSettingsWidget(); EffectsSettingsWidget() = default;
ErrorOr<void> setup_interface();
ErrorOr<void> load_settings(); ErrorOr<void> load_settings();