diff --git a/Userland/Applications/CrashReporter/main.cpp b/Userland/Applications/CrashReporter/main.cpp index 4877329c84..18cdca57ee 100644 --- a/Userland/Applications/CrashReporter/main.cpp +++ b/Userland/Applications/CrashReporter/main.cpp @@ -237,7 +237,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto& tab_widget = *widget->find_descendant_of_type_named("tab_widget"); auto backtrace_tab = TRY(tab_widget.try_add_tab("Backtrace"_string)); - TRY(backtrace_tab->try_set_layout(4)); + backtrace_tab->set_layout(4); auto backtrace_label = TRY(backtrace_tab->try_add("A backtrace for each thread alive during the crash is listed below:"_string)); backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -257,7 +257,7 @@ ErrorOr serenity_main(Main::Arguments arguments) cpu_registers_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); auto environment_tab = TRY(tab_widget.try_add_tab("Environment"_string)); - TRY(environment_tab->try_set_layout(4)); + environment_tab->set_layout(4); auto environment_text_editor = TRY(environment_tab->try_add()); environment_text_editor->set_text(DeprecatedString::join('\n', environment)); @@ -266,7 +266,7 @@ ErrorOr serenity_main(Main::Arguments arguments) environment_text_editor->set_should_hide_unnecessary_scrollbars(true); auto memory_regions_tab = TRY(tab_widget.try_add_tab("Memory Regions"_string)); - TRY(memory_regions_tab->try_set_layout(4)); + memory_regions_tab->set_layout(4); auto memory_regions_text_editor = TRY(memory_regions_tab->try_add()); memory_regions_text_editor->set_text(DeprecatedString::join('\n', memory_regions)); @@ -331,7 +331,7 @@ ErrorOr serenity_main(Main::Arguments arguments) [&](auto results) -> ErrorOr { for (auto& backtrace : results.thread_backtraces) { auto container = TRY(backtrace_tab_widget->try_add_tab(TRY(String::from_deprecated_string(backtrace.title)))); - TRY(container->template try_set_layout(4)); + container->template set_layout(4); auto backtrace_text_editor = TRY(container->template try_add()); backtrace_text_editor->set_text(backtrace.text); backtrace_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); @@ -342,7 +342,7 @@ ErrorOr serenity_main(Main::Arguments arguments) for (auto& cpu_registers : results.thread_cpu_registers) { auto container = TRY(cpu_registers_tab_widget->try_add_tab(TRY(String::from_deprecated_string(cpu_registers.title)))); - TRY(container->template try_set_layout(4)); + container->template set_layout(4); auto cpu_registers_text_editor = TRY(container->template try_add()); cpu_registers_text_editor->set_text(cpu_registers.text); cpu_registers_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 860e264207..b9faadec97 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -71,7 +71,7 @@ PropertiesWindow::PropertiesWindow(DeprecatedString const& path, Window* parent_ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) { auto main_widget = TRY(set_main_widget()); - TRY(main_widget->try_set_layout(4, 6)); + main_widget->set_layout(4, 6); main_widget->set_fill_with_background_color(true); auto tab_widget = TRY(main_widget->try_add()); @@ -79,7 +79,7 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) TRY(create_file_type_specific_tabs(tab_widget)); auto button_widget = TRY(main_widget->try_add()); - TRY(button_widget->try_set_layout(GUI::Margins {}, 5)); + button_widget->set_layout(GUI::Margins {}, 5); button_widget->set_fixed_height(22); TRY(button_widget->add_spacer()); diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 9990c3a8a2..8a1d274c3c 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -388,7 +388,7 @@ ErrorOr run_in_desktop_mode() window->set_icon(desktop_icon); auto desktop_widget = TRY(window->set_main_widget()); - TRY(desktop_widget->try_set_layout()); + desktop_widget->set_layout(); auto directory_view = TRY(desktop_widget->try_add(DirectoryView::Mode::Desktop)); directory_view->set_name("directory_view"); diff --git a/Userland/Applications/Piano/MainWidget.cpp b/Userland/Applications/Piano/MainWidget.cpp index d53aee8a29..31c038b648 100644 --- a/Userland/Applications/Piano/MainWidget.cpp +++ b/Userland/Applications/Piano/MainWidget.cpp @@ -36,7 +36,7 @@ MainWidget::MainWidget(TrackManager& track_manager, AudioPlayerLoop& loop) ErrorOr MainWidget::initialize() { - TRY(try_set_layout(2, 2)); + set_layout(2, 2); set_fill_with_background_color(true); m_wave_widget = TRY(try_add(m_track_manager)); @@ -52,7 +52,7 @@ ErrorOr MainWidget::initialize() m_player_widget = TRY(try_add(m_track_manager, *this, m_audio_loop)); m_keys_and_knobs_container = TRY(try_add()); - TRY(m_keys_and_knobs_container->try_set_layout(GUI::Margins {}, 2)); + m_keys_and_knobs_container->set_layout(GUI::Margins {}, 2); m_keys_and_knobs_container->set_fixed_height(130); m_keys_and_knobs_container->set_fill_with_background_color(true); @@ -60,7 +60,7 @@ ErrorOr MainWidget::initialize() m_octave_container = TRY(m_keys_and_knobs_container->try_add()); m_octave_container->set_preferred_width(GUI::SpecialDimension::Fit); - TRY(m_octave_container->try_set_layout()); + m_octave_container->set_layout(); auto octave_label = TRY(m_octave_container->try_add("Octave"_string)); octave_label->set_preferred_width(GUI::SpecialDimension::Fit); m_octave_value = TRY(m_octave_container->try_add(TRY(String::number(m_track_manager.keyboard()->virtual_keyboard_octave())))); diff --git a/Userland/Applications/Piano/PlayerWidget.cpp b/Userland/Applications/Piano/PlayerWidget.cpp index 4ba18a50eb..01dde8518d 100644 --- a/Userland/Applications/Piano/PlayerWidget.cpp +++ b/Userland/Applications/Piano/PlayerWidget.cpp @@ -41,7 +41,7 @@ PlayerWidget::PlayerWidget(TrackManager& manager, MainWidget& main_widget, Audio ErrorOr PlayerWidget::initialize() { - TRY(try_set_layout()); + set_layout(); set_fill_with_background_color(true); TRY(m_track_number_choices.try_append("1")); diff --git a/Userland/Applications/Piano/TrackControlsWidget.cpp b/Userland/Applications/Piano/TrackControlsWidget.cpp index b7ccfe5286..b51d9b7c54 100644 --- a/Userland/Applications/Piano/TrackControlsWidget.cpp +++ b/Userland/Applications/Piano/TrackControlsWidget.cpp @@ -22,12 +22,12 @@ ErrorOr> TrackControlsWidget::try_create(Weak { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) TrackControlsWidget(move(track)))); - TRY(widget->try_set_layout()); + widget->set_layout(); widget->set_preferred_width(GUI::SpecialDimension::Grow); widget->set_fill_with_background_color(true); auto mastering_parameters = TRY(widget->try_add()); - TRY(mastering_parameters->try_set_layout()); + mastering_parameters->set_layout(); auto strong_track = widget->m_track.value(); @@ -40,7 +40,7 @@ ErrorOr> TrackControlsWidget::try_create(Weak for (auto& processor : strong_track->processor_chain()) { auto processor_parameters = TRY(widget->try_add()); - TRY(processor_parameters->try_set_layout()); + processor_parameters->set_layout(); for (auto& parameter : processor->parameters()) (void)TRY(processor_parameters->try_add(parameter)); diff --git a/Userland/Applications/PixelPaint/Filters/Bloom.cpp b/Userland/Applications/PixelPaint/Filters/Bloom.cpp index d2b969b569..7725d07d86 100644 --- a/Userland/Applications/PixelPaint/Filters/Bloom.cpp +++ b/Userland/Applications/PixelPaint/Filters/Bloom.cpp @@ -38,7 +38,7 @@ ErrorOr> Bloom::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - TRY(settings_widget->try_set_layout()); + settings_widget->set_layout(); auto name_label = TRY(settings_widget->try_add("Bloom Filter"_string)); name_label->set_font_weight(Gfx::FontWeight::Bold); @@ -47,7 +47,7 @@ ErrorOr> Bloom::get_settings_widget() auto luma_lower_container = TRY(settings_widget->try_add()); luma_lower_container->set_fixed_height(50); - TRY(luma_lower_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + luma_lower_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); auto luma_lower_label = TRY(luma_lower_container->try_add("Luma lower bound:"_string)); luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -63,7 +63,7 @@ ErrorOr> Bloom::get_settings_widget() auto radius_container = TRY(settings_widget->try_add()); radius_container->set_fixed_height(50); - TRY(radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + radius_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); auto radius_label = TRY(radius_container->try_add("Blur Radius:"_string)); radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp index 31266dd94b..5144e4cfda 100644 --- a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp +++ b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp @@ -40,7 +40,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - TRY(settings_widget->try_set_layout()); + settings_widget->set_layout(); auto name_label = TRY(settings_widget->try_add("Fast Box Blur Filter"_string)); name_label->set_font_weight(Gfx::FontWeight::Bold); @@ -86,7 +86,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_radius_container = TRY(settings_widget->try_add()); m_radius_container->set_fixed_height(20); - TRY(m_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + m_radius_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); auto radius_label = TRY(m_radius_container->try_add("Radius:"_string)); radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -103,7 +103,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_asymmetric_radius_container = TRY(settings_widget->try_add()); m_asymmetric_radius_container->set_visible(false); m_asymmetric_radius_container->set_fixed_height(50); - TRY(m_asymmetric_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + m_asymmetric_radius_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); auto radius_x_container = TRY(m_asymmetric_radius_container->try_add()); radius_x_container->set_fixed_height(20); @@ -123,7 +123,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto radius_y_container = TRY(m_asymmetric_radius_container->try_add()); radius_y_container->set_fixed_height(20); - TRY(radius_y_container->try_set_layout()); + radius_y_container->set_layout(); auto radius_y_label = TRY(radius_y_container->try_add("Radius Y:"_string)); radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -140,11 +140,11 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_vector_container = TRY(settings_widget->try_add()); m_vector_container->set_visible(false); m_vector_container->set_fixed_height(50); - TRY(m_vector_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + m_vector_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); auto angle_container = TRY(m_vector_container->try_add()); angle_container->set_fixed_height(20); - TRY(angle_container->try_set_layout()); + angle_container->set_layout(); auto angle_label = TRY(angle_container->try_add("Angle:"_string)); angle_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -160,7 +160,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto magnitude_container = TRY(m_vector_container->try_add()); magnitude_container->set_fixed_height(20); - TRY(magnitude_container->try_set_layout()); + magnitude_container->set_layout(); auto magnitude_label = TRY(magnitude_container->try_add("Magnitude:"_string)); magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -176,7 +176,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto gaussian_container = TRY(settings_widget->try_add()); gaussian_container->set_fixed_height(20); - TRY(gaussian_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + gaussian_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); m_gaussian_checkbox = TRY(gaussian_container->try_add("Approximate Gaussian Blur"_string)); m_gaussian_checkbox->set_checked(m_approximate_gauss); diff --git a/Userland/Applications/PixelPaint/Filters/Filter.cpp b/Userland/Applications/PixelPaint/Filters/Filter.cpp index 177ad5a03a..f766e50e78 100644 --- a/Userland/Applications/PixelPaint/Filters/Filter.cpp +++ b/Userland/Applications/PixelPaint/Filters/Filter.cpp @@ -26,7 +26,7 @@ ErrorOr> Filter::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - (void)TRY(settings_widget->try_set_layout()); + settings_widget->set_layout(); auto name_label = TRY(settings_widget->try_add(TRY(String::from_utf8(filter_name())))); name_label->set_text_alignment(Gfx::TextAlignment::TopLeft); diff --git a/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp b/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp index b442715013..e4b6231ded 100644 --- a/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp +++ b/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp @@ -31,7 +31,7 @@ ErrorOr> HueAndSaturation::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - (void)TRY(settings_widget->try_set_layout()); + settings_widget->set_layout(); auto add_slider = [&](auto name, int min, int max, auto member) -> ErrorOr { auto name_label = TRY(settings_widget->try_add(TRY(String::from_utf8(name)))); diff --git a/Userland/Applications/PixelPaint/Filters/Sepia.cpp b/Userland/Applications/PixelPaint/Filters/Sepia.cpp index 7cc5c00e12..a77e14d2ff 100644 --- a/Userland/Applications/PixelPaint/Filters/Sepia.cpp +++ b/Userland/Applications/PixelPaint/Filters/Sepia.cpp @@ -21,7 +21,7 @@ ErrorOr> Sepia::get_settings_widget() { if (!m_settings_widget) { auto settings_widget = TRY(GUI::Widget::try_create()); - TRY(settings_widget->try_set_layout()); + settings_widget->set_layout(); auto name_label = TRY(settings_widget->try_add("Sepia Filter"_string)); name_label->set_font_weight(Gfx::FontWeight::Bold); @@ -30,7 +30,7 @@ ErrorOr> Sepia::get_settings_widget() auto amount_container = TRY(settings_widget->try_add()); amount_container->set_fixed_height(20); - TRY(amount_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); + amount_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); auto amount_label = TRY(amount_container->try_add("Amount:"_string)); amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp index 279f462b68..553936a8bc 100644 --- a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp @@ -141,11 +141,11 @@ ErrorOr BrushTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto size_container = TRY(properties_widget->try_add()); size_container->set_fixed_height(20); - (void)TRY(size_container->try_set_layout()); + size_container->set_layout(); auto size_label = TRY(size_container->try_add("Size:"_string)); size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -165,7 +165,7 @@ ErrorOr BrushTool::get_properties_widget() auto hardness_container = TRY(properties_widget->try_add()); hardness_container->set_fixed_height(20); - (void)TRY(hardness_container->try_set_layout()); + hardness_container->set_layout(); auto hardness_label = TRY(hardness_container->try_add("Hardness:"_string)); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/BucketTool.cpp b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp index c47e20d56d..491cbff7f8 100644 --- a/Userland/Applications/PixelPaint/Tools/BucketTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp @@ -65,11 +65,11 @@ ErrorOr BucketTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto threshold_container = TRY(properties_widget->try_add()); threshold_container->set_fixed_height(20); - (void)TRY(threshold_container->try_set_layout()); + threshold_container->set_layout(); auto threshold_label = TRY(threshold_container->try_add("Threshold:"_string)); threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp index 8e3349bbf7..8c85c0094a 100644 --- a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp @@ -129,11 +129,11 @@ ErrorOr CloneTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto size_container = TRY(properties_widget->try_add()); size_container->set_fixed_height(20); - (void)TRY(size_container->try_set_layout()); + size_container->set_layout(); auto size_label = TRY(size_container->try_add("Size:"_string)); size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -152,7 +152,7 @@ ErrorOr CloneTool::get_properties_widget() auto hardness_container = TRY(properties_widget->try_add()); hardness_container->set_fixed_height(20); - (void)TRY(hardness_container->try_set_layout()); + hardness_container->set_layout(); auto hardness_label = TRY(hardness_container->try_add("Hardness:"_string)); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp index 2fb632a66a..f57047a585 100644 --- a/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp @@ -130,11 +130,11 @@ ErrorOr EllipseTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto thickness_container = TRY(properties_widget->try_add()); thickness_container->set_fixed_height(20); - (void)TRY(thickness_container->try_set_layout()); + thickness_container->set_layout(); auto thickness_label = TRY(thickness_container->try_add("Thickness:"_string)); thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -151,12 +151,12 @@ ErrorOr EllipseTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(70); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add("Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); auto mode_radio_container = TRY(mode_container->try_add()); - (void)TRY(mode_radio_container->try_set_layout()); + mode_radio_container->set_layout(); auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_string)); auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_string)); auto aa_enable_checkbox = TRY(mode_radio_container->try_add("Anti-alias"_string)); @@ -178,7 +178,7 @@ ErrorOr EllipseTool::get_properties_widget() auto aspect_container = TRY(properties_widget->try_add()); aspect_container->set_fixed_height(20); - (void)TRY(aspect_container->try_set_layout()); + aspect_container->set_layout(); auto aspect_label = TRY(aspect_container->try_add("Aspect Ratio:"_string)); aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp index 633df47e6e..9519873265 100644 --- a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp @@ -58,11 +58,11 @@ ErrorOr EraseTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto size_container = TRY(properties_widget->try_add()); size_container->set_fixed_height(20); - (void)TRY(size_container->try_set_layout()); + size_container->set_layout(); auto size_label = TRY(size_container->try_add("Size:"_string)); size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -80,7 +80,7 @@ ErrorOr EraseTool::get_properties_widget() auto hardness_container = TRY(properties_widget->try_add()); hardness_container->set_fixed_height(20); - (void)TRY(hardness_container->try_set_layout()); + hardness_container->set_layout(); auto hardness_label = TRY(hardness_container->try_add("Hardness:"_string)); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -97,7 +97,7 @@ ErrorOr EraseTool::get_properties_widget() auto secondary_color_container = TRY(properties_widget->try_add()); secondary_color_container->set_fixed_height(20); - (void)TRY(secondary_color_container->try_set_layout()); + secondary_color_container->set_layout(); auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add()); use_secondary_color_checkbox->set_checked(m_use_secondary_color); @@ -108,13 +108,13 @@ ErrorOr EraseTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(46); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add("Draw Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); auto mode_radio_container = TRY(mode_container->try_add()); - (void)TRY(mode_radio_container->try_set_layout()); + mode_radio_container->set_layout(); auto pencil_mode_radio = TRY(mode_radio_container->try_add("Pencil"_string)); auto brush_mode_radio = TRY(mode_radio_container->try_add("Brush"_string)); diff --git a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp index 016b110d26..42ebc1fc39 100644 --- a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp @@ -202,11 +202,11 @@ ErrorOr GradientTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(20); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add("Gradient Type:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(80, 20); @@ -235,7 +235,7 @@ ErrorOr GradientTool::get_properties_widget() auto opacity_container = TRY(properties_widget->try_add()); opacity_container->set_fixed_height(20); - (void)TRY(opacity_container->try_set_layout()); + opacity_container->set_layout(); auto opacity_label = TRY(opacity_container->try_add("Opacity:"_string)); opacity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -253,7 +253,7 @@ ErrorOr GradientTool::get_properties_widget() set_primary_slider(opacity_slider); auto hardness_container = TRY(properties_widget->try_add()); - (void)TRY(hardness_container->try_set_layout()); + hardness_container->set_layout(); hardness_container->set_fixed_height(20); hardness_container->set_visible(m_mode == GradientMode::Radial); @@ -294,7 +294,7 @@ ErrorOr GradientTool::get_properties_widget() auto button_container = TRY(properties_widget->try_add()); button_container->set_fixed_height(22); - TRY(button_container->try_set_layout()); + button_container->set_layout(); button_container->add_spacer().release_value_but_fixme_should_propagate_errors(); auto apply_button = TRY(button_container->try_add("Apply"_string)); diff --git a/Userland/Applications/PixelPaint/Tools/GuideTool.cpp b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp index 93417d3b10..0eaafa8e6a 100644 --- a/Userland/Applications/PixelPaint/Tools/GuideTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp @@ -180,11 +180,11 @@ ErrorOr GuideTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto snapping_container = TRY(properties_widget->try_add()); snapping_container->set_fixed_height(20); - (void)TRY(snapping_container->try_set_layout()); + snapping_container->set_layout(); auto snapping_label = TRY(snapping_container->try_add("Snap offset:"_string)); snapping_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp index 6410f2ff27..f4382b6074 100644 --- a/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp @@ -161,11 +161,11 @@ ErrorOr LassoSelectTool::get_properties_widget() } auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(20); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add()); mode_label->set_text("Mode:"_string); diff --git a/Userland/Applications/PixelPaint/Tools/LineTool.cpp b/Userland/Applications/PixelPaint/Tools/LineTool.cpp index 1139a17a2a..d41b150483 100644 --- a/Userland/Applications/PixelPaint/Tools/LineTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/LineTool.cpp @@ -123,11 +123,11 @@ ErrorOr LineTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto thickness_container = TRY(properties_widget->try_add()); thickness_container->set_fixed_height(20); - (void)TRY(thickness_container->try_set_layout()); + thickness_container->set_layout(); auto thickness_label = TRY(thickness_container->try_add("Thickness:"_string)); thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -144,7 +144,7 @@ ErrorOr LineTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(20); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add("Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/MoveTool.cpp b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp index 786e723c4f..8a20ea99cd 100644 --- a/Userland/Applications/PixelPaint/Tools/MoveTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp @@ -293,17 +293,17 @@ ErrorOr MoveTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto selection_mode_container = TRY(properties_widget->try_add()); - (void)TRY(selection_mode_container->try_set_layout()); + selection_mode_container->set_layout(); selection_mode_container->set_fixed_height(46); auto selection_mode_label = TRY(selection_mode_container->try_add("Selection Mode:"_string)); selection_mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); selection_mode_label->set_fixed_size(80, 40); auto mode_radio_container = TRY(selection_mode_container->try_add()); - (void)TRY(mode_radio_container->try_set_layout()); + mode_radio_container->set_layout(); m_selection_mode_foreground = TRY(mode_radio_container->try_add("Foreground"_string)); m_selection_mode_active = TRY(mode_radio_container->try_add("Active Layer"_string)); diff --git a/Userland/Applications/PixelPaint/Tools/PenTool.cpp b/Userland/Applications/PixelPaint/Tools/PenTool.cpp index c8e06da2c3..5d13c1904f 100644 --- a/Userland/Applications/PixelPaint/Tools/PenTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PenTool.cpp @@ -39,11 +39,11 @@ ErrorOr PenTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto size_container = TRY(properties_widget->try_add()); size_container->set_fixed_height(20); - (void)TRY(size_container->try_set_layout()); + size_container->set_layout(); auto size_label = TRY(size_container->try_add("Thickness:"_string)); size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/PickerTool.cpp b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp index 808d6f7532..4e34d79794 100644 --- a/Userland/Applications/PixelPaint/Tools/PickerTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp @@ -45,7 +45,7 @@ ErrorOr PickerTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto sample_checkbox = TRY(properties_widget->try_add("Sample all layers"_string)); sample_checkbox->set_checked(m_sample_all_layers); diff --git a/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp index 0ad4149d43..2a55610d01 100644 --- a/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp @@ -190,11 +190,11 @@ ErrorOr PolygonalSelectTool::get_properties_widget() return m_properties_widget.ptr(); auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(20); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add()); mode_label->set_text("Mode:"_string); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp index 797301be9c..14399d735a 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp @@ -158,11 +158,11 @@ ErrorOr RectangleSelectTool::get_properties_widget() } auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto feather_container = TRY(properties_widget->try_add()); feather_container->set_fixed_height(20); - (void)TRY(feather_container->try_set_layout()); + feather_container->set_layout(); auto feather_label = TRY(feather_container->try_add()); feather_label->set_text("Feather:"_string); @@ -181,7 +181,7 @@ ErrorOr RectangleSelectTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(20); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add()); mode_label->set_text("Mode:"_string); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp index f6df5abd61..e98307913a 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp @@ -144,11 +144,11 @@ ErrorOr RectangleTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto thickness_or_radius_container = TRY(properties_widget->try_add()); thickness_or_radius_container->set_fixed_height(20); - (void)TRY(thickness_or_radius_container->try_set_layout()); + thickness_or_radius_container->set_layout(); auto thickness_or_radius_label = TRY(thickness_or_radius_container->try_add()); thickness_or_radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -180,13 +180,13 @@ ErrorOr RectangleTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(90); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add("Mode:"_string)); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_fixed_size(30, 20); auto mode_radio_container = TRY(mode_container->try_add()); - (void)TRY(mode_radio_container->try_set_layout()); + mode_radio_container->set_layout(); auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_string)); auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_string)); auto gradient_mode_radio = TRY(mode_radio_container->try_add("Gradient"_string)); @@ -213,7 +213,7 @@ ErrorOr RectangleTool::get_properties_widget() outline_mode_radio->set_checked(true); auto mode_extras_container = TRY(mode_container->try_add()); - (void)TRY(mode_extras_container->try_set_layout()); + mode_extras_container->set_layout(); auto aa_enable_checkbox = TRY(mode_extras_container->try_add("Anti-alias"_string)); aa_enable_checkbox->on_checked = [this](bool checked) { @@ -222,7 +222,7 @@ ErrorOr RectangleTool::get_properties_widget() aa_enable_checkbox->set_checked(true); auto aspect_container = TRY(mode_extras_container->try_add()); - (void)TRY(aspect_container->try_set_layout()); + aspect_container->set_layout(); aspect_container->set_fixed_width(75); auto aspect_label = TRY(aspect_container->try_add("Aspect Ratio:"_string)); @@ -231,7 +231,7 @@ ErrorOr RectangleTool::get_properties_widget() auto aspect_fields_container = TRY(aspect_container->try_add()); aspect_fields_container->set_fixed_width(75); - (void)TRY(aspect_fields_container->try_set_layout()); + aspect_fields_container->set_layout(); m_aspect_w_textbox = TRY(aspect_fields_container->try_add()); m_aspect_w_textbox->set_fixed_height(20); diff --git a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp index f347b78825..6d34acb104 100644 --- a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp @@ -94,11 +94,11 @@ ErrorOr SprayTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto size_container = TRY(properties_widget->try_add()); size_container->set_fixed_height(20); - (void)TRY(size_container->try_set_layout()); + size_container->set_layout(); auto size_label = TRY(size_container->try_add("Size:"_string)); size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -115,7 +115,7 @@ ErrorOr SprayTool::get_properties_widget() auto density_container = TRY(properties_widget->try_add()); density_container->set_fixed_height(20); - (void)TRY(density_container->try_set_layout()); + density_container->set_layout(); auto density_label = TRY(density_container->try_add("Density:"_string)); density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/TextTool.cpp b/Userland/Applications/PixelPaint/Tools/TextTool.cpp index ad946b3f30..0226ebb779 100644 --- a/Userland/Applications/PixelPaint/Tools/TextTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/TextTool.cpp @@ -109,7 +109,7 @@ ErrorOr TextTool::get_properties_widget() return m_properties_widget.ptr(); auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto font_header = TRY(properties_widget->try_add("Current Font:"_string)); font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp index 3171b977ba..d134202c2d 100644 --- a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp @@ -73,11 +73,11 @@ ErrorOr WandSelectTool::get_properties_widget() } auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto threshold_container = TRY(properties_widget->try_add()); threshold_container->set_fixed_height(20); - (void)TRY(threshold_container->try_set_layout()); + threshold_container->set_layout(); auto threshold_label = TRY(threshold_container->try_add("Threshold:"_string)); threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -94,7 +94,7 @@ ErrorOr WandSelectTool::get_properties_widget() auto mode_container = TRY(properties_widget->try_add()); mode_container->set_fixed_height(20); - (void)TRY(mode_container->try_set_layout()); + mode_container->set_layout(); auto mode_label = TRY(mode_container->try_add()); mode_label->set_text("Mode:"_string); diff --git a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp index fe3c4bfba4..1327cf5dc1 100644 --- a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp @@ -27,11 +27,11 @@ ErrorOr ZoomTool::get_properties_widget() { if (!m_properties_widget) { auto properties_widget = TRY(GUI::Widget::try_create()); - (void)TRY(properties_widget->try_set_layout()); + properties_widget->set_layout(); auto sensitivity_container = TRY(properties_widget->try_add()); sensitivity_container->set_fixed_height(20); - (void)TRY(sensitivity_container->try_set_layout()); + sensitivity_container->set_layout(); auto sensitivity_label = TRY(sensitivity_container->try_add("Sensitivity:"_string)); sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp b/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp index d9d052b75a..75ba3071a4 100644 --- a/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp +++ b/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp @@ -16,7 +16,7 @@ ErrorOr> ProgressWindow::try_create(StringView tit auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - TRY(main_widget->try_set_layout()); + main_widget->set_layout(); auto label = TRY(main_widget->try_add("Analyzing storage space..."_string)); label->set_fixed_height(22); diff --git a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index d8096face2..6619aa8921 100644 --- a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -18,7 +18,7 @@ namespace SystemMonitor { ErrorOr> ProcessFileDescriptorMapWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessFileDescriptorMapWidget())); - TRY(widget->try_set_layout(4)); + widget->set_layout(4); widget->m_table_view = TRY(widget->try_add()); Vector pid_fds_fields; diff --git a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index a24f467930..9fd727f65c 100644 --- a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -52,7 +52,7 @@ public: ErrorOr> ProcessMemoryMapWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessMemoryMapWidget())); - TRY(widget->try_set_layout(4)); + widget->set_layout(4); widget->m_table_view = TRY(widget->try_add()); Vector pid_vm_fields; diff --git a/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp b/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp index 065ab41e6c..feef225818 100644 --- a/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp @@ -96,7 +96,7 @@ private: ErrorOr> ProcessStateWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessStateWidget())); - TRY(widget->try_set_layout(4)); + widget->set_layout(4); widget->m_table_view = TRY(widget->try_add()); widget->m_table_view->set_model(TRY(try_make_ref_counted(ProcessModel::the(), 0))); widget->m_table_view->column_header().set_visible(false); diff --git a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index 3d13a48aaf..521a879708 100644 --- a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -19,7 +19,7 @@ namespace SystemMonitor { ErrorOr> ProcessUnveiledPathsWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessUnveiledPathsWidget())); - TRY(widget->try_set_layout(4)); + widget->set_layout(4); widget->m_table_view = TRY(widget->try_add()); Vector pid_unveil_fields; diff --git a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp index 3bdea84556..425d4f3bca 100644 --- a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp +++ b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp @@ -74,7 +74,7 @@ private: ErrorOr> ThreadStackWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ThreadStackWidget())); - TRY(widget->try_set_layout(4)); + widget->set_layout(4); widget->m_stack_table = TRY(widget->try_add()); widget->m_stack_table->set_model(TRY(try_make_ref_counted())); return widget; diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index 8c146852ba..39c551ac28 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -578,7 +578,7 @@ ErrorOr build_performance_tab(GUI::Widget& graphs_container) Vector cpu_graphs; for (auto row = 0u; row < cpu_graph_rows; ++row) { auto cpu_graph_row = TRY(cpu_graph_group_box.try_add()); - TRY(cpu_graph_row->try_set_layout(6)); + cpu_graph_row->set_layout(6); cpu_graph_row->set_fixed_height(108); for (auto i = 0u; i < cpu_graphs_per_row; ++i) { auto cpu_graph = TRY(cpu_graph_row->try_add()); diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index aea401d7af..0c146cc888 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -167,10 +167,10 @@ static ErrorOr> create_find_window(VT::TerminalWidget auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); main_widget->set_background_role(ColorRole::Button); - TRY(main_widget->try_set_layout(4)); + main_widget->set_layout(4); auto find = TRY(main_widget->try_add()); - TRY(find->try_set_layout(4)); + find->set_layout(4); find->set_fixed_height(30); auto find_textbox = TRY(find->try_add()); diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index 991d83de4c..315d097f55 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -466,12 +466,12 @@ ErrorOr MainWidget::add_property_tab(PropertyTab const& property_tab) auto properties_list = TRY(GUI::Widget::try_create()); scrollable_container->set_widget(properties_list); - TRY(properties_list->try_set_layout(GUI::Margins { 8 }, 12)); + properties_list->set_layout(GUI::Margins { 8 }, 12); for (auto const& group : property_tab.property_groups) { NonnullRefPtr group_box = TRY(properties_list->try_add(group.title)); // 1px less on the left makes the text line up with the group title. - TRY(group_box->try_set_layout(GUI::Margins { 8, 8, 8, 7 }, 12)); + group_box->set_layout(GUI::Margins { 8, 8, 8, 7 }, 12); group_box->set_preferred_height(GUI::SpecialDimension::Fit); for (auto const& property : group.properties) { diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp index d657e44696..cb3ae8d175 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -42,7 +42,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto catdog_widget = TRY(CatDog::create()); window->set_main_widget(catdog_widget); - TRY(catdog_widget->try_set_layout(GUI::Margins {}, 0)); + catdog_widget->set_layout(GUI::Margins {}, 0); auto context_menu = TRY(GUI::Menu::try_create()); TRY(context_menu->try_add_action(GUI::CommonActions::make_about_action("CatDog Demo", app_icon, window))); @@ -62,7 +62,7 @@ ErrorOr serenity_main(Main::Arguments arguments) advice_window->set_alpha_hit_threshold(1.0f); auto advice_widget = TRY(advice_window->set_main_widget(catdog_widget)); - TRY(advice_widget->try_set_layout(GUI::Margins {}, 0)); + advice_widget->set_layout(GUI::Margins {}, 0); auto advice_timer = TRY(Core::Timer::create_single_shot(15'000, [&] { window->move_to_front(); diff --git a/Userland/Demos/ModelGallery/GalleryWidget.cpp b/Userland/Demos/ModelGallery/GalleryWidget.cpp index 897ef8d7c1..ae5b792588 100644 --- a/Userland/Demos/ModelGallery/GalleryWidget.cpp +++ b/Userland/Demos/ModelGallery/GalleryWidget.cpp @@ -13,7 +13,7 @@ GalleryWidget::GalleryWidget() set_layout(); auto& inner_widget = add(); - inner_widget.try_set_layout(4).release_value_but_fixme_should_propagate_errors(); + inner_widget.set_layout(4); m_tab_widget = inner_widget.try_add().release_value_but_fixme_should_propagate_errors(); m_statusbar = add(); diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index 98ea14583d..2460e79a5f 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -132,7 +132,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto tab_widget = TRY(main_splitter->try_add()); auto tree_tab = TRY(tab_widget->try_add_tab("Call Tree"_string)); - TRY(tree_tab->try_set_layout(4)); + tree_tab->set_layout(4); auto bottom_splitter = TRY(tree_tab->try_add()); auto tree_view = TRY(bottom_splitter->try_add()); @@ -181,7 +181,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }); auto samples_tab = TRY(tab_widget->try_add_tab("Samples"_string)); - TRY(samples_tab->try_set_layout(4)); + samples_tab->set_layout(4); auto samples_splitter = TRY(samples_tab->try_add()); auto samples_table_view = TRY(samples_splitter->try_add()); @@ -195,7 +195,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; auto signposts_tab = TRY(tab_widget->try_add_tab("Signposts"_string)); - TRY(signposts_tab->try_set_layout(4)); + signposts_tab->set_layout(4); auto signposts_splitter = TRY(signposts_tab->try_add()); auto signposts_table_view = TRY(signposts_splitter->try_add()); @@ -209,7 +209,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; auto flamegraph_tab = TRY(tab_widget->try_add_tab("Flame Graph"_string)); - TRY(flamegraph_tab->try_set_layout(GUI::Margins { 4, 4, 4, 4 })); + flamegraph_tab->set_layout(GUI::Margins { 4, 4, 4, 4 }); auto flamegraph_view = TRY(flamegraph_tab->try_add(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount)); @@ -257,7 +257,7 @@ ErrorOr serenity_main(Main::Arguments arguments) flamegraph_view->on_hover_change = [&] { statusbar_update(); }; auto filesystem_events_tab = TRY(tab_widget->try_add_tab("Filesystem events"_string)); - TRY(filesystem_events_tab->try_set_layout(4)); + filesystem_events_tab->set_layout(4); auto filesystem_events_tree_view = TRY(filesystem_events_tab->try_add()); filesystem_events_tree_view->set_should_fill_selected_rows(true); diff --git a/Userland/Games/GameOfLife/main.cpp b/Userland/Games/GameOfLife/main.cpp index ea08079efd..26b64069b8 100644 --- a/Userland/Games/GameOfLife/main.cpp +++ b/Userland/Games/GameOfLife/main.cpp @@ -60,7 +60,7 @@ ErrorOr serenity_main(Main::Arguments arguments) main_toolbar.layout()->set_margins({ 0, 6 }); auto& board_widget_container = *main_widget->find_descendant_of_type_named("board_widget_container"); - TRY(board_widget_container.try_set_layout(GUI::Margins {}, 0)); + board_widget_container.set_layout(GUI::Margins {}, 0); auto board_widget = TRY(board_widget_container.try_add(board_rows, board_columns)); board_widget->randomize_cells(); diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp index b0ad436a6f..2c74def08f 100644 --- a/Userland/Libraries/LibGUI/InputBox.cpp +++ b/Userland/Libraries/LibGUI/InputBox.cpp @@ -128,12 +128,12 @@ void InputBox::on_done(ExecResult result) ErrorOr InputBox::build() { auto main_widget = TRY(set_main_widget()); - TRY(main_widget->try_set_layout(6, 6)); + main_widget->set_layout(6, 6); main_widget->set_fill_with_background_color(true); if (!m_prompt.is_empty()) { auto prompt_container = TRY(main_widget->try_add()); - TRY(prompt_container->try_set_layout(0, 8)); + prompt_container->set_layout(0, 8); if (m_icon) { auto image_widget = TRY(prompt_container->try_add()); image_widget->set_bitmap(m_icon); @@ -158,7 +158,7 @@ ErrorOr InputBox::build() } auto button_container = TRY(main_widget->try_add()); - TRY(button_container->try_set_layout(0, 6)); + button_container->set_layout(0, 6); TRY(button_container->add_spacer()); m_ok_button = TRY(button_container->try_add("OK"_string)); diff --git a/Userland/Libraries/LibGUI/MessageBox.cpp b/Userland/Libraries/LibGUI/MessageBox.cpp index 5e08370864..fed51d0611 100644 --- a/Userland/Libraries/LibGUI/MessageBox.cpp +++ b/Userland/Libraries/LibGUI/MessageBox.cpp @@ -152,11 +152,11 @@ ErrorOr MessageBox::build() { auto main_widget = TRY(set_main_widget()); main_widget->set_fill_with_background_color(true); - TRY(main_widget->try_set_layout(8, 6)); + main_widget->set_layout(8, 6); auto message_container = TRY(main_widget->try_add()); auto message_margins = Margins { 8, m_type != Type::None ? 8 : 0 }; - TRY(message_container->try_set_layout(message_margins, 8)); + message_container->set_layout(message_margins, 8); if (auto icon = TRY(this->icon()); icon && m_type != Type::None) { auto image_widget = TRY(message_container->try_add()); @@ -170,7 +170,7 @@ ErrorOr MessageBox::build() m_text_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); auto button_container = TRY(main_widget->try_add()); - TRY(button_container->try_set_layout(Margins {}, 8)); + button_container->set_layout(Margins {}, 8); auto add_button = [&](String text, ExecResult result) -> ErrorOr> { auto button = TRY(button_container->try_add()); diff --git a/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp b/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp index 512e0a4227..2fb1a9c6d0 100644 --- a/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/PathBreadcrumbbar.cpp @@ -27,7 +27,7 @@ ErrorOr> PathBreadcrumbbar::try_create() auto breadcrumbbar = TRY(Breadcrumbbar::try_create()); auto path_breadcrumbbar = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) PathBreadcrumbbar(*location_text_box, *breadcrumbbar))); - (void)TRY(path_breadcrumbbar->try_set_layout()); + path_breadcrumbbar->set_layout(); TRY(path_breadcrumbbar->try_add_child(location_text_box)); TRY(path_breadcrumbbar->try_add_child(breadcrumbbar)); diff --git a/Userland/Libraries/LibGUI/SettingsWindow.cpp b/Userland/Libraries/LibGUI/SettingsWindow.cpp index d44c9c204b..1fe98f202a 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.cpp +++ b/Userland/Libraries/LibGUI/SettingsWindow.cpp @@ -34,13 +34,13 @@ ErrorOr> SettingsWindow::create(DeprecatedString t auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - TRY(main_widget->try_set_layout(4, 6)); + main_widget->set_layout(4, 6); window->m_tab_widget = TRY(main_widget->try_add()); auto button_container = TRY(main_widget->try_add()); button_container->set_preferred_size({ SpecialDimension::Grow, SpecialDimension::Fit }); - TRY(button_container->try_set_layout(GUI::Margins {}, 6)); + button_container->set_layout(GUI::Margins {}, 6); if (show_defaults_button == ShowDefaultsButton::Yes) { window->m_reset_button = TRY(button_container->try_add("Defaults"_string)); diff --git a/Userland/Libraries/LibGUI/Widget.h b/Userland/Libraries/LibGUI/Widget.h index 1d1a73926e..10609fe609 100644 --- a/Userland/Libraries/LibGUI/Widget.h +++ b/Userland/Libraries/LibGUI/Widget.h @@ -80,14 +80,6 @@ public: Layout const* layout() const { return m_layout.ptr(); } void set_layout(NonnullRefPtr); - template - ErrorOr try_set_layout(Args&&... args) - { - auto layout = TRY(T::try_create(forward(args)...)); - set_layout(*layout); - return {}; - } - template inline void set_layout(Args&&... args) { diff --git a/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp b/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp index af02150861..f948b61091 100644 --- a/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp +++ b/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp @@ -24,13 +24,13 @@ ErrorOr CoverWizardPage::build(String title, String subtitle) { set_fill_with_background_color(true); set_background_role(Gfx::ColorRole::Base); - TRY(try_set_layout()); + set_layout(); m_banner_image_widget = TRY(try_add()); m_banner_image_widget->set_fixed_size(160, 315); m_banner_image_widget->load_from_file("/res/graphics/wizard-banner-simple.png"sv); m_content_widget = TRY(try_add()); - TRY(m_content_widget->try_set_layout(20)); + m_content_widget->set_layout(20); m_header_label = TRY(m_content_widget->try_add