From 77ad0fdb0726aba2ecaf7ea9764a642671d1fd6f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Thu, 16 Feb 2023 21:07:06 +0000 Subject: Userland: Specify margins and spacing in the GUI::Layout constructor --- .../devel/templates/serenity-application/main.cpp | 3 +-- Userland/Applets/Audio/main.cpp | 4 +--- Userland/Applications/Assistant/main.cpp | 7 +++--- .../Applications/Browser/BookmarksBarWidget.cpp | 4 +--- Userland/Applications/Browser/DownloadWidget.cpp | 3 +-- Userland/Applications/Browser/InspectorWidget.cpp | 21 ++++++----------- Userland/Applications/Calendar/AddEventDialog.cpp | 9 +++----- Userland/Applications/CrashReporter/main.cpp | 18 +++++---------- .../Applications/FileManager/PropertiesWindow.cpp | 7 ++---- Userland/Applications/ImageViewer/MainWidget.cpp | 3 +-- .../KeyboardMapper/KeyboardMapperWidget.cpp | 3 +-- Userland/Applications/PDFViewer/SidebarWidget.cpp | 6 ++--- Userland/Applications/Piano/MainWidget.cpp | 7 ++---- Userland/Applications/Piano/SamplerWidget.cpp | 7 ++---- .../PixelPaint/CreateNewImageDialog.cpp | 3 +-- .../PixelPaint/CreateNewLayerDialog.cpp | 4 +--- Userland/Applications/PixelPaint/FilterParams.h | 3 +-- Userland/Applications/PixelPaint/Filters/Bloom.cpp | 6 ++--- .../PixelPaint/Filters/FastBoxBlur.cpp | 12 ++++------ Userland/Applications/PixelPaint/Filters/Sepia.cpp | 3 +-- .../PixelPaint/LayerPropertiesWidget.cpp | 4 +--- Userland/Applications/PixelPaint/PaletteWidget.cpp | 9 +++----- .../PixelPaint/ToolPropertiesWidget.cpp | 3 +-- Userland/Applications/PixelPaint/ToolboxWidget.cpp | 5 +--- .../Applications/Spreadsheet/CellTypeDialog.cpp | 27 ++++++++-------------- .../Applications/Spreadsheet/SpreadsheetView.cpp | 2 +- .../Applications/Spreadsheet/SpreadsheetWidget.cpp | 6 ++--- .../SystemMonitor/MemoryStatsWidget.cpp | 4 +--- .../SystemMonitor/NetworkStatisticsWidget.cpp | 12 ++++------ .../ProcessFileDescriptorMapWidget.cpp | 3 +-- .../SystemMonitor/ProcessMemoryMapWidget.cpp | 3 +-- .../SystemMonitor/ProcessStateWidget.cpp | 3 +-- .../SystemMonitor/ProcessUnveiledPathsWidget.cpp | 3 +-- .../SystemMonitor/ThreadStackWidget.cpp | 3 +-- Userland/Applications/SystemMonitor/main.cpp | 3 +-- Userland/Applications/Terminal/main.cpp | 6 ++--- Userland/Applications/ThemeEditor/MainWidget.cpp | 8 ++----- Userland/Demos/CatDog/main.cpp | 6 ++--- Userland/Demos/ModelGallery/GalleryWidget.cpp | 3 +-- Userland/DevTools/HackStudio/HackStudioWidget.cpp | 9 +++----- Userland/DevTools/Profiler/main.cpp | 18 +++++---------- Userland/DevTools/SQLStudio/MainWidget.cpp | 3 +-- Userland/Games/GameOfLife/main.cpp | 3 +-- Userland/Games/Hearts/Game.cpp | 4 +--- Userland/Games/Hearts/SettingsDialog.cpp | 9 +++----- Userland/Libraries/LibGUI/Breadcrumbbar.cpp | 3 +-- Userland/Libraries/LibGUI/ColorPicker.cpp | 23 ++++++------------ Userland/Libraries/LibGUI/CommandPalette.cpp | 3 +-- Userland/Libraries/LibGUI/EmojiInputDialog.cpp | 4 +--- Userland/Libraries/LibGUI/InputBox.cpp | 8 ++----- Userland/Libraries/LibGUI/MessageBox.cpp | 11 +++------ Userland/Libraries/LibGUI/ProcessChooser.cpp | 3 +-- Userland/Libraries/LibGUI/SettingsWindow.cpp | 7 ++---- Userland/Libraries/LibGUI/Statusbar.cpp | 4 +--- Userland/Libraries/LibGUI/Toolbar.cpp | 4 +--- Userland/Libraries/LibGUI/ToolbarContainer.cpp | 3 +-- .../Libraries/LibGUI/Wizards/CoverWizardPage.cpp | 3 +-- Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp | 7 ++---- Userland/Libraries/LibGUI/Wizards/WizardPage.cpp | 9 +++----- .../NotificationServer/NotificationWindow.cpp | 4 +--- Userland/Services/Taskbar/ClockWidget.cpp | 13 ++++------- Userland/Services/Taskbar/QuickLaunchWidget.cpp | 3 +-- Userland/Services/Taskbar/ShutdownDialog.cpp | 14 ++++------- Userland/Services/Taskbar/TaskbarWindow.cpp | 6 ++--- 64 files changed, 136 insertions(+), 288 deletions(-) diff --git a/Base/res/devel/templates/serenity-application/main.cpp b/Base/res/devel/templates/serenity-application/main.cpp index 27582ff42f..49a750ba83 100644 --- a/Base/res/devel/templates/serenity-application/main.cpp +++ b/Base/res/devel/templates/serenity-application/main.cpp @@ -23,8 +23,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - auto layout = TRY(main_widget->try_set_layout()); - layout->set_margins(16); + (void)TRY(main_widget->try_set_layout(16)); auto button = TRY(main_widget->try_add("Click me!")); button->on_click = [&](auto) { diff --git a/Userland/Applets/Audio/main.cpp b/Userland/Applets/Audio/main.cpp index 01135dd17d..6f4d1c81c8 100644 --- a/Userland/Applets/Audio/main.cpp +++ b/Userland/Applets/Audio/main.cpp @@ -82,9 +82,7 @@ private: m_root_container = TRY(m_slider_window->set_main_widget()); m_root_container->set_fill_with_background_color(true); - m_root_container->set_layout(); - m_root_container->layout()->set_margins({ 4 }); - m_root_container->layout()->set_spacing(0); + m_root_container->set_layout(4, 0); m_root_container->set_frame_shape(Gfx::FrameShape::Window); m_percent_box = m_root_container->add(String::from_utf8_short_string("\xE2\x84\xB9"sv)); diff --git a/Userland/Applications/Assistant/main.cpp b/Userland/Applications/Assistant/main.cpp index 8a3da7be54..8f7287217f 100644 --- a/Userland/Applications/Assistant/main.cpp +++ b/Userland/Applications/Assistant/main.cpp @@ -182,12 +182,11 @@ ErrorOr serenity_main(Main::Arguments arguments) auto container = TRY(window->set_main_widget()); container->set_fill_with_background_color(true); container->set_frame_shape(Gfx::FrameShape::Window); - auto& layout = container->set_layout(); - layout.set_margins({ 8 }); + container->set_layout(8); auto& text_box = container->add(); auto& results_container = container->add(); - auto& results_layout = results_container.set_layout(); + results_container.set_layout(); auto mark_selected_item = [&]() { for (size_t i = 0; i < app_state.visible_result_count; ++i) { @@ -250,7 +249,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto update_ui_timer = TRY(Core::Timer::create_single_shot(10, [&] { results_container.remove_all_children(); - results_layout.set_margins(app_state.visible_result_count ? GUI::Margins { 4, 0, 0, 0 } : GUI::Margins { 0 }); + results_container.layout()->set_margins(app_state.visible_result_count ? GUI::Margins { 4, 0, 0, 0 } : GUI::Margins { 0 }); for (size_t i = 0; i < app_state.visible_result_count; ++i) { auto& result = app_state.results[i]; diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp index 9166057b48..6e9514b95b 100644 --- a/Userland/Applications/Browser/BookmarksBarWidget.cpp +++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp @@ -103,9 +103,7 @@ BookmarksBarWidget& BookmarksBarWidget::the() BookmarksBarWidget::BookmarksBarWidget(DeprecatedString const& bookmarks_file, bool enabled) { s_the = this; - set_layout(); - layout()->set_spacing(0); - layout()->set_margins(2); + set_layout(2, 0); set_fixed_height(20); diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index c440eb1311..5155b9e596 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -59,8 +59,7 @@ DownloadWidget::DownloadWidget(const URL& url) m_download->stream_into(*m_output_file_stream); set_fill_with_background_color(true); - auto& layout = set_layout(); - layout.set_margins(4); + set_layout(4); auto& animation_container = add(); animation_container.set_fixed_height(32); diff --git a/Userland/Applications/Browser/InspectorWidget.cpp b/Userland/Applications/Browser/InspectorWidget.cpp index 8e8ad57ee1..08ca2a415c 100644 --- a/Userland/Applications/Browser/InspectorWidget.cpp +++ b/Userland/Applications/Browser/InspectorWidget.cpp @@ -77,15 +77,13 @@ InspectorWidget::InspectorWidget() { set_fill_with_background_color(true); - auto& layout = set_layout(); - layout.set_margins({ 4, 4, 4, 4 }); + set_layout(4); auto& splitter = add(); auto& top_tab_widget = splitter.add(); auto& dom_tree_container = top_tab_widget.add_tab("DOM"); - dom_tree_container.set_layout(); - dom_tree_container.layout()->set_margins({ 4, 4, 4, 4 }); + dom_tree_container.set_layout(4); m_dom_tree_view = dom_tree_container.add(); m_dom_tree_view->on_selection_change = [this] { const auto& index = m_dom_tree_view->selection().first(); @@ -93,30 +91,25 @@ InspectorWidget::InspectorWidget() }; auto& accessibility_tree_container = top_tab_widget.add_tab("Accessibility"); - accessibility_tree_container.set_layout(); - accessibility_tree_container.layout()->set_margins({ 4, 4, 4, 4 }); + accessibility_tree_container.set_layout(4); m_accessibility_tree_view = accessibility_tree_container.add(); auto& bottom_tab_widget = splitter.add(); auto& computed_style_table_container = bottom_tab_widget.add_tab("Computed"); - computed_style_table_container.set_layout(); - computed_style_table_container.layout()->set_margins({ 4, 4, 4, 4 }); + computed_style_table_container.set_layout(4); m_computed_style_table_view = computed_style_table_container.add(); auto& resolved_style_table_container = bottom_tab_widget.add_tab("Resolved"); - resolved_style_table_container.set_layout(); - resolved_style_table_container.layout()->set_margins({ 4, 4, 4, 4 }); + resolved_style_table_container.set_layout(4); m_resolved_style_table_view = resolved_style_table_container.add(); auto& custom_properties_table_container = bottom_tab_widget.add_tab("Variables"); - custom_properties_table_container.set_layout(); - custom_properties_table_container.layout()->set_margins({ 4, 4, 4, 4 }); + custom_properties_table_container.set_layout(4); m_custom_properties_table_view = custom_properties_table_container.add(); auto& box_model_widget = bottom_tab_widget.add_tab("Box Model"); - box_model_widget.set_layout(); - box_model_widget.layout()->set_margins({ 4, 4, 4, 4 }); + box_model_widget.set_layout(4); m_element_size_view = box_model_widget.add(); m_element_size_view->set_should_hide_unnecessary_scrollbars(true); diff --git a/Userland/Applications/Calendar/AddEventDialog.cpp b/Userland/Applications/Calendar/AddEventDialog.cpp index 973871ed6c..2e02f94098 100644 --- a/Userland/Applications/Calendar/AddEventDialog.cpp +++ b/Userland/Applications/Calendar/AddEventDialog.cpp @@ -33,9 +33,8 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window) widget->set_layout(); auto& top_container = widget->add(); - top_container.set_layout(); + top_container.set_layout(4); top_container.set_fixed_height(45); - top_container.layout()->set_margins(4); auto& add_label = top_container.add("Add title & date:"); add_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -46,14 +45,12 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window) event_title_textbox.set_fixed_height(20); auto& middle_container = widget->add(); - middle_container.set_layout(); + middle_container.set_layout(4); middle_container.set_fixed_height(25); - middle_container.layout()->set_margins(4); auto& time_container = widget->add(); - time_container.set_layout(); + time_container.set_layout(4); time_container.set_fixed_height(25); - time_container.layout()->set_margins(4); auto& starting_month_combo = middle_container.add(); starting_month_combo.set_only_allow_values_from_model(true); diff --git a/Userland/Applications/CrashReporter/main.cpp b/Userland/Applications/CrashReporter/main.cpp index d17bb5339d..60f67619ca 100644 --- a/Userland/Applications/CrashReporter/main.cpp +++ b/Userland/Applications/CrashReporter/main.cpp @@ -216,8 +216,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")); - (void)TRY(backtrace_tab->try_set_layout()); - backtrace_tab->layout()->set_margins(4); + (void)TRY(backtrace_tab->try_set_layout(4)); auto backtrace_label = TRY(backtrace_tab->try_add("A backtrace for each thread alive during the crash is listed below:")); backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -227,8 +226,7 @@ ErrorOr serenity_main(Main::Arguments arguments) backtrace_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); auto cpu_registers_tab = TRY(tab_widget.try_add_tab("CPU Registers")); - cpu_registers_tab->set_layout(); - cpu_registers_tab->layout()->set_margins(4); + cpu_registers_tab->set_layout(4); auto cpu_registers_label = TRY(cpu_registers_tab->try_add("The CPU register state for each thread alive during the crash is listed below:")); cpu_registers_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -238,8 +236,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")); - (void)TRY(environment_tab->try_set_layout()); - environment_tab->layout()->set_margins(4); + (void)TRY(environment_tab->try_set_layout(4)); auto environment_text_editor = TRY(environment_tab->try_add()); environment_text_editor->set_text(DeprecatedString::join('\n', environment)); @@ -248,8 +245,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")); - (void)TRY(memory_regions_tab->try_set_layout()); - memory_regions_tab->layout()->set_margins(4); + (void)TRY(memory_regions_tab->try_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)); @@ -307,8 +303,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(backtrace.title)); - (void)TRY(container->template try_set_layout()); - container->layout()->set_margins(4); + (void)TRY(container->template try_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); @@ -319,8 +314,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(cpu_registers.title)); - (void)TRY(container->template try_set_layout()); - container->layout()->set_margins(4); + (void)TRY(container->template try_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 47b5a60a04..afebbe3700 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -53,9 +53,7 @@ PropertiesWindow::PropertiesWindow(DeprecatedString const& path, Window* parent_ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) { auto main_widget = TRY(set_main_widget()); - (void)TRY(main_widget->try_set_layout()); - main_widget->layout()->set_spacing(6); - main_widget->layout()->set_margins(4); + (void)TRY(main_widget->try_set_layout(4, 6)); main_widget->set_fill_with_background_color(true); auto tab_widget = TRY(main_widget->try_add()); @@ -151,9 +149,8 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) TRY(setup_permission_checkboxes(*others_read, *others_write, *others_execute, { S_IROTH, S_IWOTH, S_IXOTH }, m_mode)); auto button_widget = TRY(main_widget->try_add()); - (void)TRY(button_widget->try_set_layout()); + (void)TRY(button_widget->try_set_layout(GUI::Margins {}, 5)); button_widget->set_fixed_height(22); - button_widget->layout()->set_spacing(5); TRY(button_widget->add_spacer()); diff --git a/Userland/Applications/ImageViewer/MainWidget.cpp b/Userland/Applications/ImageViewer/MainWidget.cpp index 70b04f33c0..a585288c49 100644 --- a/Userland/Applications/ImageViewer/MainWidget.cpp +++ b/Userland/Applications/ImageViewer/MainWidget.cpp @@ -11,8 +11,7 @@ namespace ImageViewer { MainWidget::MainWidget() { set_fill_with_background_color(true); - set_layout(); - layout()->set_spacing(2); + set_layout(GUI::Margins {}, 2); } void MainWidget::keydown_event(GUI::KeyEvent& event) diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index 8ddcbe394f..738e102d3e 100644 --- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -39,8 +39,7 @@ bool KeyboardMapperWidget::request_close() void KeyboardMapperWidget::create_frame() { set_fill_with_background_color(true); - set_layout(); - layout()->set_margins(4); + set_layout(4); auto& main_widget = add(); main_widget.set_relative_rect(0, 0, 200, 200); diff --git a/Userland/Applications/PDFViewer/SidebarWidget.cpp b/Userland/Applications/PDFViewer/SidebarWidget.cpp index 35ca3df457..cb3cc14201 100644 --- a/Userland/Applications/PDFViewer/SidebarWidget.cpp +++ b/Userland/Applications/PDFViewer/SidebarWidget.cpp @@ -18,8 +18,7 @@ SidebarWidget::SidebarWidget() auto& tab_bar = add(); auto& outline_container = tab_bar.add_tab("Outline"); - outline_container.set_layout(); - outline_container.layout()->set_margins(4); + outline_container.set_layout(4); m_outline_tree_view = outline_container.add(); m_outline_tree_view->set_activates_on_selection(true); @@ -34,8 +33,7 @@ SidebarWidget::SidebarWidget() }; auto& thumbnails_container = tab_bar.add_tab("Thumbnails"); - thumbnails_container.set_layout(); - thumbnails_container.layout()->set_margins(4); + thumbnails_container.set_layout(4); // FIXME: Add thumbnail previews } diff --git a/Userland/Applications/Piano/MainWidget.cpp b/Userland/Applications/Piano/MainWidget.cpp index 293cda7efe..351eb8032e 100644 --- a/Userland/Applications/Piano/MainWidget.cpp +++ b/Userland/Applications/Piano/MainWidget.cpp @@ -34,9 +34,7 @@ MainWidget::MainWidget(TrackManager& track_manager, AudioPlayerLoop& loop) ErrorOr MainWidget::initialize() { - (void)TRY(try_set_layout()); - layout()->set_spacing(2); - layout()->set_margins(2); + (void)TRY(try_set_layout(2, 2)); set_fill_with_background_color(true); m_wave_widget = TRY(try_add(m_track_manager)); @@ -51,8 +49,7 @@ ErrorOr MainWidget::initialize() m_player_widget = TRY(try_add(m_track_manager, m_audio_loop)); m_keys_and_knobs_container = TRY(try_add()); - (void)TRY(m_keys_and_knobs_container->try_set_layout()); - m_keys_and_knobs_container->layout()->set_spacing(2); + (void)TRY(m_keys_and_knobs_container->try_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); diff --git a/Userland/Applications/Piano/SamplerWidget.cpp b/Userland/Applications/Piano/SamplerWidget.cpp index 26ac5fdb6c..bfe7e4f779 100644 --- a/Userland/Applications/Piano/SamplerWidget.cpp +++ b/Userland/Applications/Piano/SamplerWidget.cpp @@ -40,14 +40,11 @@ void WaveEditor::paint_event(GUI::PaintEvent& event) SamplerWidget::SamplerWidget(TrackManager& track_manager) : m_track_manager(track_manager) { - set_layout(); - layout()->set_margins(10); - layout()->set_spacing(10); + set_layout(10, 10); set_fill_with_background_color(true); m_open_button_and_recorded_sample_name_container = add(); - m_open_button_and_recorded_sample_name_container->set_layout(); - m_open_button_and_recorded_sample_name_container->layout()->set_spacing(10); + m_open_button_and_recorded_sample_name_container->set_layout(GUI::Margins {}, 10); m_open_button_and_recorded_sample_name_container->set_fixed_height(24); m_open_button = m_open_button_and_recorded_sample_name_container->add(); diff --git a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp index 51999deca5..dec5c81ed9 100644 --- a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp @@ -30,8 +30,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) auto main_widget = set_main_widget().release_value_but_fixme_should_propagate_errors(); main_widget->set_fill_with_background_color(true); - auto& layout = main_widget->set_layout(); - layout.set_margins(4); + main_widget->set_layout(4); auto& name_label = main_widget->add("Name:"); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp b/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp index f22569127a..b18123887f 100644 --- a/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp @@ -22,9 +22,7 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win auto main_widget = set_main_widget().release_value_but_fixme_should_propagate_errors(); main_widget->set_fill_with_background_color(true); - - auto& layout = main_widget->set_layout(); - layout.set_margins(4); + main_widget->set_layout(4); auto& name_label = main_widget->add("Name:"); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/FilterParams.h b/Userland/Applications/PixelPaint/FilterParams.h index 30c14168aa..e8d0d02b94 100644 --- a/Userland/Applications/PixelPaint/FilterParams.h +++ b/Userland/Applications/PixelPaint/FilterParams.h @@ -52,8 +52,7 @@ private: main_widget->set_frame_shape(Gfx::FrameShape::Container); main_widget->set_frame_shadow(Gfx::FrameShadow::Raised); main_widget->set_fill_with_background_color(true); - auto& layout = main_widget->template set_layout(); - layout.set_margins(4); + main_widget->template set_layout(4); size_t index = 0; size_t columns = N; diff --git a/Userland/Applications/PixelPaint/Filters/Bloom.cpp b/Userland/Applications/PixelPaint/Filters/Bloom.cpp index 3c504742ba..f2b106b98f 100644 --- a/Userland/Applications/PixelPaint/Filters/Bloom.cpp +++ b/Userland/Applications/PixelPaint/Filters/Bloom.cpp @@ -47,8 +47,7 @@ ErrorOr> Bloom::get_settings_widget() auto luma_lower_container = TRY(settings_widget->try_add()); luma_lower_container->set_fixed_height(50); - auto luma_lower_container_layout = TRY(luma_lower_container->try_set_layout()); - luma_lower_container_layout->set_margins({ 4, 0, 4, 0 }); + (void)TRY(luma_lower_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto luma_lower_label = TRY(luma_lower_container->try_add("Luma lower bound:")); luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -64,8 +63,7 @@ ErrorOr> Bloom::get_settings_widget() auto radius_container = TRY(settings_widget->try_add()); radius_container->set_fixed_height(50); - auto radius_container_layout = TRY(radius_container->try_set_layout()); - radius_container_layout->set_margins({ 4, 0, 4, 0 }); + (void)TRY(radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto radius_label = TRY(radius_container->try_add("Blur Radius:")); 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 4734ad30e2..aa4a26e4ea 100644 --- a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp +++ b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp @@ -86,8 +86,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() m_radius_container = TRY(settings_widget->try_add()); m_radius_container->set_fixed_height(20); - auto radius_container_layout = TRY(m_radius_container->try_set_layout()); - radius_container_layout->set_margins({ 4, 0, 4, 0 }); + (void)TRY(m_radius_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto radius_label = TRY(m_radius_container->try_add("Radius:")); radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -104,8 +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); - auto asymmetric_radius_container_label = TRY(m_asymmetric_radius_container->try_set_layout()); - asymmetric_radius_container_label->set_margins({ 4, 0, 4, 0 }); + (void)TRY(m_asymmetric_radius_container->try_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); @@ -142,8 +140,7 @@ 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); - auto vector_container_layout = TRY(m_vector_container->try_set_layout()); - vector_container_layout->set_margins({ 4, 0, 4, 0 }); + (void)TRY(m_vector_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto angle_container = TRY(m_vector_container->try_add()); angle_container->set_fixed_height(20); @@ -179,8 +176,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto gaussian_container = TRY(settings_widget->try_add()); gaussian_container->set_fixed_height(20); - auto gaussian_container_layout = TRY(gaussian_container->try_set_layout()); - gaussian_container_layout->set_margins({ 4, 0, 4, 0 }); + (void)TRY(gaussian_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); m_gaussian_checkbox = TRY(gaussian_container->try_add(TRY(String::from_utf8("Approximate Gaussian Blur"sv)))); m_gaussian_checkbox->set_checked(m_approximate_gauss); diff --git a/Userland/Applications/PixelPaint/Filters/Sepia.cpp b/Userland/Applications/PixelPaint/Filters/Sepia.cpp index 438bb4487b..c32a2037d8 100644 --- a/Userland/Applications/PixelPaint/Filters/Sepia.cpp +++ b/Userland/Applications/PixelPaint/Filters/Sepia.cpp @@ -30,8 +30,7 @@ ErrorOr> Sepia::get_settings_widget() auto amount_container = TRY(settings_widget->try_add()); amount_container->set_fixed_height(20); - auto amount_layout = TRY(amount_container->try_set_layout()); - amount_layout->set_margins({ 4, 0, 4, 0 }); + (void)TRY(amount_container->try_set_layout(GUI::Margins { 4, 0, 4, 0 })); auto amount_label = TRY(amount_container->try_add("Amount:")); amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp index 96ec8d72da..f436773540 100644 --- a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp +++ b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp @@ -24,9 +24,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() set_layout(); auto& group_box = add("Layer properties"sv); - auto& layout = group_box.set_layout(); - - layout.set_margins({ 8 }); + group_box.set_layout(8); auto& name_container = group_box.add(); name_container.set_fixed_height(20); diff --git a/Userland/Applications/PixelPaint/PaletteWidget.cpp b/Userland/Applications/PixelPaint/PaletteWidget.cpp index b5dd9b0833..7b53dde7eb 100644 --- a/Userland/Applications/PixelPaint/PaletteWidget.cpp +++ b/Userland/Applications/PixelPaint/PaletteWidget.cpp @@ -118,18 +118,15 @@ PaletteWidget::PaletteWidget() m_color_container = add(); m_color_container->set_relative_rect(m_secondary_color_widget->relative_rect().right() + 2, 2, 500, 33); - m_color_container->set_layout(); - m_color_container->layout()->set_spacing(1); + m_color_container->set_layout(GUI::Margins {}, 1); auto& top_color_container = m_color_container->add(); top_color_container.set_name("top_color_container"); - top_color_container.set_layout(); - top_color_container.layout()->set_spacing(1); + top_color_container.set_layout(GUI::Margins {}, 1); auto& bottom_color_container = m_color_container->add(); bottom_color_container.set_name("bottom_color_container"); - bottom_color_container.set_layout(); - bottom_color_container.layout()->set_spacing(1); + bottom_color_container.set_layout(GUI::Margins {}, 1); auto result = load_palette_path("/res/color-palettes/default.palette"); if (result.is_error()) { diff --git a/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp b/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp index cd0642165e..299ba1dda6 100644 --- a/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp +++ b/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp @@ -20,8 +20,7 @@ ToolPropertiesWidget::ToolPropertiesWidget() set_layout(); m_group_box = add("Tool properties"sv); - auto& layout = m_group_box->set_layout(); - layout.set_margins({ 8 }); + m_group_box->set_layout(8); m_tool_widget_stack = m_group_box->add(); m_blank_widget = m_tool_widget_stack->add(); m_error_label = m_tool_widget_stack->add(); diff --git a/Userland/Applications/PixelPaint/ToolboxWidget.cpp b/Userland/Applications/PixelPaint/ToolboxWidget.cpp index f116871d60..f8bb4341f1 100644 --- a/Userland/Applications/PixelPaint/ToolboxWidget.cpp +++ b/Userland/Applications/PixelPaint/ToolboxWidget.cpp @@ -39,10 +39,7 @@ ToolboxWidget::ToolboxWidget() set_fill_with_background_color(true); set_fixed_width(26); - - set_layout(); - layout()->set_spacing(0); - layout()->set_margins(2); + set_layout(2, 0); m_action_group.set_exclusive(true); m_action_group.set_unchecking_allowed(false); diff --git a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp index de0f822e7e..4e38fe7413 100644 --- a/Userland/Applications/Spreadsheet/CellTypeDialog.cpp +++ b/Userland/Applications/Spreadsheet/CellTypeDialog.cpp @@ -46,7 +46,7 @@ CellTypeDialog::CellTypeDialog(Vector const& positions, Sheet& sheet, resize(285, 360); auto main_widget = set_main_widget().release_value_but_fixme_should_propagate_errors(); - main_widget->set_layout().set_margins(4); + main_widget->set_layout(4); main_widget->set_fill_with_background_color(true); auto& tab_widget = main_widget->add(); @@ -54,8 +54,7 @@ CellTypeDialog::CellTypeDialog(Vector const& positions, Sheet& sheet, auto& buttonbox = main_widget->add(); buttonbox.set_shrink_to_fit(true); - auto& button_layout = buttonbox.set_layout(); - button_layout.set_spacing(10); + buttonbox.set_layout(GUI::Margins {}, 10); buttonbox.add_spacer().release_value_but_fixme_should_propagate_errors(); auto& ok_button = buttonbox.add(String::from_utf8_short_string("OK"sv)); ok_button.set_fixed_width(80); @@ -134,7 +133,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po } auto& type_tab = tabs.add_tab("Type"); - type_tab.set_layout().set_margins(4); + type_tab.set_layout(4); { auto& left_side = type_tab.add(); left_side.set_layout(); @@ -199,14 +198,13 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po } auto& alignment_tab = tabs.add_tab("Alignment"); - alignment_tab.set_layout().set_margins(4); + alignment_tab.set_layout(4); { // FIXME: Frame? // Horizontal alignment { auto& horizontal_alignment_selection_container = alignment_tab.add(); - horizontal_alignment_selection_container.set_layout(); - horizontal_alignment_selection_container.layout()->set_margins({ 4, 0, 0 }); + horizontal_alignment_selection_container.set_layout(GUI::Margins { 4, 0, 0 }); horizontal_alignment_selection_container.set_fixed_height(22); auto& horizontal_alignment_label = horizontal_alignment_selection_container.add(); @@ -237,8 +235,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po // Vertical alignment { auto& vertical_alignment_container = alignment_tab.add(); - vertical_alignment_container.set_layout(); - vertical_alignment_container.layout()->set_margins({ 4, 0, 0 }); + vertical_alignment_container.set_layout(GUI::Margins { 4, 0, 0 }); vertical_alignment_container.set_fixed_height(22); auto& vertical_alignment_label = vertical_alignment_container.add(); @@ -268,7 +265,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po } auto& colors_tab = tabs.add_tab("Color"); - colors_tab.set_layout().set_margins(4); + colors_tab.set_layout(4); { // Static formatting { @@ -279,8 +276,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po { // FIXME: Somehow allow unsetting these. auto& foreground_container = static_formatting_container.add(); - foreground_container.set_layout(); - foreground_container.layout()->set_margins({ 4, 0, 0 }); + foreground_container.set_layout(GUI::Margins { 4, 0, 0 }); foreground_container.set_preferred_height(GUI::SpecialDimension::Fit); auto& foreground_label = foreground_container.add(); @@ -299,8 +295,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector const& po { // FIXME: Somehow allow unsetting these. auto& background_container = static_formatting_container.add(); - background_container.set_layout(); - background_container.layout()->set_margins({ 4, 0, 0 }); + background_container.set_layout(GUI::Margins { 4, 0, 0 }); background_container.set_preferred_height(GUI::SpecialDimension::Fit); auto& background_label = background_container.add(); @@ -427,9 +422,7 @@ ConditionView::~ConditionView() ConditionsView::ConditionsView() { - auto& layout = set_layout(); - layout.set_spacing(4); - layout.set_margins({ 6 }); + set_layout(6, 4); } void ConditionsView::set_formats(Vector* formats) diff --git a/Userland/Applications/Spreadsheet/SpreadsheetView.cpp b/Userland/Applications/Spreadsheet/SpreadsheetView.cpp index 0dc712e119..a7f37e9d66 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetView.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetView.cpp @@ -305,7 +305,7 @@ SpreadsheetView::SpreadsheetView(Sheet& sheet) : m_sheet(sheet) , m_sheet_model(SheetModel::create(*m_sheet)) { - set_layout().set_margins(2); + set_layout(2); m_table_view = add(); m_table_view->set_grid_style(GUI::TableView::GridStyle::Both); m_table_view->set_selection_behavior(GUI::AbstractView::SelectionBehavior::SelectItems); diff --git a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp index 5d8fcc72fa..d0a802e1f2 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetWidget.cpp @@ -31,7 +31,7 @@ SpreadsheetWidget::SpreadsheetWidget(GUI::Window& parent_window, NonnullRefPtrVe : m_workbook(make(move(sheets), parent_window)) { set_fill_with_background_color(true); - set_layout().set_margins(2); + set_layout(2); auto& toolbar_container = add(); auto& toolbar = toolbar_container.add(); @@ -39,7 +39,7 @@ SpreadsheetWidget::SpreadsheetWidget(GUI::Window& parent_window, NonnullRefPtrVe auto& container = add(); auto& top_bar = container.add(); - top_bar.set_layout().set_spacing(1); + top_bar.set_layout(GUI::Margins {}, 1); top_bar.set_preferred_height(26); auto& current_cell_label = top_bar.add(""); current_cell_label.set_fixed_width(50); @@ -83,7 +83,7 @@ SpreadsheetWidget::SpreadsheetWidget(GUI::Window& parent_window, NonnullRefPtrVe m_inline_documentation_window->set_resizable(false); auto inline_widget = m_inline_documentation_window->set_main_widget().release_value_but_fixme_should_propagate_errors(); inline_widget->set_fill_with_background_color(true); - inline_widget->set_layout().set_margins(4); + inline_widget->set_layout(4); inline_widget->set_frame_shape(Gfx::FrameShape::Box); m_inline_documentation_label = inline_widget->add(); m_inline_documentation_label->set_fill_with_background_color(true); diff --git a/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp b/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp index 5c952bae9b..7f39c063a3 100644 --- a/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp +++ b/Userland/Applications/SystemMonitor/MemoryStatsWidget.cpp @@ -43,9 +43,7 @@ MemoryStatsWidget::MemoryStatsWidget(GraphWidget* graph) set_fixed_height(110); - set_layout(); - layout()->set_margins({ 8, 0, 0 }); - layout()->set_spacing(3); + set_layout(GUI::Margins { 8, 0, 0 }, 3); auto build_widgets_for_label = [this](DeprecatedString const& description) -> RefPtr { auto& container = add(); diff --git a/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp b/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp index e1d4db4f5d..c09ec480d9 100644 --- a/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp +++ b/Userland/Applications/SystemMonitor/NetworkStatisticsWidget.cpp @@ -22,8 +22,7 @@ namespace SystemMonitor { NetworkStatisticsWidget::NetworkStatisticsWidget() { on_first_show = [this](auto&) { - set_layout(); - layout()->set_margins(4); + set_layout(4); set_fill_with_background_color(true); m_network_connected_bitmap = Gfx::Bitmap::load_from_file("/res/icons/16x16/network-connected.png"sv).release_value_but_fixme_should_propagate_errors(); @@ -38,8 +37,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() } auto& adapters_group_box = add("Adapters"sv); - adapters_group_box.set_layout(); - adapters_group_box.layout()->set_margins(6); + adapters_group_box.set_layout(6); adapters_group_box.set_fixed_height(120); m_adapter_table_view = adapters_group_box.add(); @@ -94,8 +92,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() }; auto& tcp_sockets_group_box = add("TCP Sockets"sv); - tcp_sockets_group_box.set_layout(); - tcp_sockets_group_box.layout()->set_margins(6); + tcp_sockets_group_box.set_layout(6); m_tcp_socket_table_view = tcp_sockets_group_box.add(); @@ -115,8 +112,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget() m_tcp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_tcp_socket_model))); auto& udp_sockets_group_box = add("UDP Sockets"sv); - udp_sockets_group_box.set_layout(); - udp_sockets_group_box.layout()->set_margins(6); + udp_sockets_group_box.set_layout(6); m_udp_socket_table_view = udp_sockets_group_box.add(); diff --git a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index bd3a1117f1..c1a5db07c5 100644 --- a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -17,8 +17,7 @@ namespace SystemMonitor { ProcessFileDescriptorMapWidget::ProcessFileDescriptorMapWidget() { - set_layout(); - layout()->set_margins(4); + set_layout(4); m_table_view = add(); Vector pid_fds_fields; diff --git a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index dfe9a341e0..2feabf542c 100644 --- a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -51,8 +51,7 @@ public: ProcessMemoryMapWidget::ProcessMemoryMapWidget() { - set_layout(); - layout()->set_margins(4); + set_layout(4); m_table_view = add(); Vector pid_vm_fields; pid_vm_fields.empend( diff --git a/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp b/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp index 7236e7a906..2ac88a3c3d 100644 --- a/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp @@ -95,8 +95,7 @@ private: ProcessStateWidget::ProcessStateWidget() { - set_layout(); - layout()->set_margins(4); + set_layout(4); m_table_view = add(); m_table_view->set_model(adopt_ref(*new ProcessStateModel(ProcessModel::the(), 0))); m_table_view->column_header().set_visible(false); diff --git a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index dbf549f474..e064543976 100644 --- a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -18,8 +18,7 @@ namespace SystemMonitor { ProcessUnveiledPathsWidget::ProcessUnveiledPathsWidget() { - set_layout(); - layout()->set_margins(4); + set_layout(4); m_table_view = add(); Vector pid_unveil_fields; diff --git a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp index 4f14651bc0..4bb4ef6ae5 100644 --- a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp +++ b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp @@ -73,8 +73,7 @@ private: ThreadStackWidget::ThreadStackWidget() { - set_layout(); - layout()->set_margins(4); + set_layout(4); m_stack_table = add(); m_stack_table->set_model(adopt_ref(*new ThreadStackModel())); } diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index 7f16f626fa..b08a07e984 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -561,8 +561,7 @@ void build_performance_tab(GUI::Widget& graphs_container) Vector cpu_graphs; for (auto row = 0u; row < cpu_graph_rows; ++row) { auto& cpu_graph_row = cpu_graph_group_box.add(); - cpu_graph_row.set_layout(); - cpu_graph_row.layout()->set_margins(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 = cpu_graph_row.add(); diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index 07da8ba674..a947218e90 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -175,12 +175,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); - (void)TRY(main_widget->try_set_layout()); - main_widget->layout()->set_margins(4); + (void)TRY(main_widget->try_set_layout(4)); auto find = TRY(main_widget->try_add()); - (void)TRY(find->try_set_layout()); - find->layout()->set_margins(4); + (void)TRY(find->try_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 41c386c64b..a6621ecc11 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -435,16 +435,12 @@ ErrorOr MainWidget::add_property_tab(PropertyTab const& property_tab) auto properties_list = TRY(GUI::Widget::try_create()); scrollable_container->set_widget(properties_list); - (void)TRY(properties_list->try_set_layout()); - properties_list->layout()->set_spacing(12); - properties_list->layout()->set_margins({ 8 }); + (void)TRY(properties_list->try_set_layout(GUI::Margins { 8 }, 12)); for (auto const& group : property_tab.property_groups) { NonnullRefPtr group_box = TRY(properties_list->try_add(group.title)); - (void)TRY(group_box->try_set_layout()); - group_box->layout()->set_spacing(12); // 1px less on the left makes the text line up with the group title. - group_box->layout()->set_margins({ 8, 8, 8, 7 }); + (void)TRY(group_box->try_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 6075cac907..4bd9868c14 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -42,8 +42,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto catdog_widget = TRY(CatDog::create()); window->set_main_widget(catdog_widget); - (void)TRY(catdog_widget->try_set_layout()); - catdog_widget->layout()->set_spacing(0); + (void)TRY(catdog_widget->try_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))); @@ -63,8 +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)); - (void)TRY(advice_widget->try_set_layout()); - advice_widget->layout()->set_spacing(0); + (void)TRY(advice_widget->try_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 5effbd5781..43e8c090e0 100644 --- a/Userland/Demos/ModelGallery/GalleryWidget.cpp +++ b/Userland/Demos/ModelGallery/GalleryWidget.cpp @@ -13,8 +13,7 @@ GalleryWidget::GalleryWidget() set_layout(); auto& inner_widget = add(); - auto inner_layout = inner_widget.try_set_layout().release_value_but_fixme_should_propagate_errors(); - inner_layout->set_margins({ 4 }); + (void)inner_widget.try_set_layout(4).release_value_but_fixme_should_propagate_errors(); m_tab_widget = inner_widget.try_add().release_value_but_fixme_should_propagate_errors(); m_statusbar = add(); diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index deeda7935b..963fad3890 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -85,8 +85,7 @@ ErrorOr> HackStudioWidget::create(DeprecatedStri widget->m_editor_font = widget->read_editor_font_from_config(); widget->set_fill_with_background_color(true); - widget->set_layout(); - widget->layout()->set_spacing(2); + widget->set_layout(GUI::Margins {}, 2); auto& toolbar_container = widget->add(); @@ -1363,15 +1362,13 @@ void HackStudioWidget::create_project_tab(GUI::Widget& parent) m_project_tab->set_tab_position(GUI::TabWidget::TabPosition::Bottom); auto& tree_view_container = m_project_tab->add_tab("Files"); - tree_view_container.set_layout(); - tree_view_container.layout()->set_margins(2); + tree_view_container.set_layout(GUI::Margins {}, 2); m_project_tree_view = tree_view_container.add(); configure_project_tree_view(); auto& class_view_container = m_project_tab->add_tab("Classes"); - class_view_container.set_layout(); - class_view_container.layout()->set_margins(2); + class_view_container.set_layout(2); m_class_view = class_view_container.add(); diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index f7580001a6..7e49cc29cb 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -132,8 +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")); - tree_tab->set_layout(); - tree_tab->layout()->set_margins(4); + (void)TRY(tree_tab->try_set_layout(4)); auto bottom_splitter = TRY(tree_tab->try_add()); auto tree_view = TRY(bottom_splitter->try_add()); @@ -182,8 +181,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }); auto samples_tab = TRY(tab_widget->try_add_tab("Samples")); - samples_tab->set_layout(); - samples_tab->layout()->set_margins(4); + (void)TRY(samples_tab->try_set_layout(4)); auto samples_splitter = TRY(samples_tab->try_add()); auto samples_table_view = TRY(samples_splitter->try_add()); @@ -197,8 +195,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; auto signposts_tab = TRY(tab_widget->try_add_tab("Signposts")); - signposts_tab->set_layout(); - signposts_tab->layout()->set_margins(4); + (void)TRY(signposts_tab->try_set_layout(4)); auto signposts_splitter = TRY(signposts_tab->try_add()); auto signposts_table_view = TRY(signposts_splitter->try_add()); @@ -212,8 +209,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; auto flamegraph_tab = TRY(tab_widget->try_add_tab("Flame Graph")); - flamegraph_tab->set_layout(); - flamegraph_tab->layout()->set_margins({ 4, 4, 4, 4 }); + (void)TRY(flamegraph_tab->try_set_layout(GUI::Margins { 4, 4, 4, 4 })); auto flamegraph_view = TRY(flamegraph_tab->try_add(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount)); @@ -261,8 +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")); - filesystem_events_tab->set_layout(); - filesystem_events_tab->layout()->set_margins(4); + (void)TRY(filesystem_events_tab->try_set_layout(4)); auto filesystem_events_tree_view = TRY(filesystem_events_tab->try_add()); filesystem_events_tree_view->set_should_fill_selected_rows(true); @@ -320,8 +315,7 @@ static bool prompt_to_stop_profiling(pid_t pid, DeprecatedString const& process_ auto widget = window->set_main_widget().release_value_but_fixme_should_propagate_errors(); widget->set_fill_with_background_color(true); - auto& layout = widget->set_layout(); - layout.set_margins({ 0, 0, 16 }); + widget->set_layout(GUI::Margins { 0, 0, 16 }); auto& timer_label = widget->add("..."); Core::ElapsedTimer clock; diff --git a/Userland/DevTools/SQLStudio/MainWidget.cpp b/Userland/DevTools/SQLStudio/MainWidget.cpp index 09700fb205..b142acbb6e 100644 --- a/Userland/DevTools/SQLStudio/MainWidget.cpp +++ b/Userland/DevTools/SQLStudio/MainWidget.cpp @@ -227,8 +227,7 @@ MainWidget::MainWidget() m_action_tab_widget = find_descendant_of_type_named("action_tab_widget"sv); m_query_results_widget = m_action_tab_widget->add_tab("Results"); - m_query_results_widget->set_layout(); - m_query_results_widget->layout()->set_margins(6); + m_query_results_widget->set_layout(6); m_query_results_table_view = m_query_results_widget->add(); m_action_tab_widget->on_tab_close_click = [this](auto&) { diff --git a/Userland/Games/GameOfLife/main.cpp b/Userland/Games/GameOfLife/main.cpp index b369f1a5bd..eef4f0c587 100644 --- a/Userland/Games/GameOfLife/main.cpp +++ b/Userland/Games/GameOfLife/main.cpp @@ -60,8 +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"); - auto board_layout = TRY(board_widget_container.try_set_layout()); - board_layout->set_spacing(0); + (void)TRY(board_widget_container.try_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/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp index e6e0fe1bca..2996d21c7d 100644 --- a/Userland/Games/Hearts/Game.cpp +++ b/Userland/Games/Hearts/Game.cpp @@ -124,9 +124,7 @@ void Game::show_score_card(bool game_over) auto score_widget = score_dialog->set_main_widget().release_value_but_fixme_should_propagate_errors(); score_widget->set_fill_with_background_color(true); - auto& layout = score_widget->set_layout(); - layout.set_margins(10); - layout.set_spacing(15); + score_widget->set_layout(10, 15); auto& card_container = score_widget->add(); auto& score_card = card_container.add(m_players, game_over); diff --git a/Userland/Games/Hearts/SettingsDialog.cpp b/Userland/Games/Hearts/SettingsDialog.cpp index f528d11e06..27a4016e03 100644 --- a/Userland/Games/Hearts/SettingsDialog.cpp +++ b/Userland/Games/Hearts/SettingsDialog.cpp @@ -22,12 +22,10 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name auto main_widget = set_main_widget().release_value_but_fixme_should_propagate_errors(); main_widget->set_fill_with_background_color(true); - auto& layout = main_widget->set_layout(); - layout.set_margins(4); + main_widget->set_layout(4); auto& name_box = main_widget->add(); - auto& input_layout = name_box.set_layout(); - input_layout.set_spacing(4); + name_box.set_layout(GUI::Margins {}, 4); auto& name_label = name_box.add("Name:"); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -39,8 +37,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name }; auto& button_box = main_widget->add(); - auto& button_layout = button_box.set_layout(); - button_layout.set_spacing(10); + button_box.set_layout(GUI::Margins {}, 12); button_box.add(String::from_utf8_short_string("Cancel"sv)).on_click = [this](auto) { done(ExecResult::Cancel); diff --git a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp index 79b83b3d43..a8db7bf70f 100644 --- a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp @@ -60,8 +60,7 @@ private: Breadcrumbbar::Breadcrumbbar() { - auto& layout = set_layout(); - layout.set_spacing(0); + set_layout(GUI::Margins {}, 0); } void Breadcrumbbar::clear_segments() diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp index f481924c7f..b4d757e47b 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.cpp +++ b/Userland/Libraries/LibGUI/ColorPicker.cpp @@ -207,31 +207,25 @@ void ColorPicker::set_color_has_alpha_channel(bool has_alpha) void ColorPicker::build_ui() { auto root_container = set_main_widget().release_value_but_fixme_should_propagate_errors(); - root_container->set_layout(); - root_container->layout()->set_margins(4); + root_container->set_layout(4); root_container->set_fill_with_background_color(true); auto& tab_widget = root_container->add(); auto& tab_palette = tab_widget.add_tab("Palette"); - tab_palette.set_layout(); - tab_palette.layout()->set_margins(4); - tab_palette.layout()->set_spacing(4); + tab_palette.set_layout(4, 4); build_ui_palette(tab_palette); auto& tab_custom_color = tab_widget.add_tab("Custom Color"); - tab_custom_color.set_layout(); - tab_custom_color.layout()->set_margins(4); - tab_custom_color.layout()->set_spacing(4); + tab_custom_color.set_layout(4, 4); build_ui_custom(tab_custom_color); auto& button_container = root_container->add(); button_container.set_preferred_height(GUI::SpecialDimension::Fit); - button_container.set_layout(); - button_container.layout()->set_spacing(4); - button_container.layout()->add_spacer(); + button_container.set_layout(4); + button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); auto& ok_button = button_container.add(); ok_button.set_text(String::from_utf8_short_string("OK"sv)); @@ -315,14 +309,11 @@ void ColorPicker::build_ui_custom(Widget& root_container) // Right Side auto& vertical_container = horizontal_container.add(); - vertical_container.set_layout(); - vertical_container.layout()->set_margins({ 0, 0, 0, 8 }); + vertical_container.set_layout(GUI::Margins { 0, 0, 0, 8 }); vertical_container.set_min_width(120); auto& preview_container = vertical_container.add(); - preview_container.set_layout(); - preview_container.layout()->set_margins(2); - preview_container.layout()->set_spacing(0); + preview_container.set_layout(2, 0); preview_container.set_fixed_height(100); // Current color diff --git a/Userland/Libraries/LibGUI/CommandPalette.cpp b/Userland/Libraries/LibGUI/CommandPalette.cpp index 2d2ad31f7d..4bf7c9c5db 100644 --- a/Userland/Libraries/LibGUI/CommandPalette.cpp +++ b/Userland/Libraries/LibGUI/CommandPalette.cpp @@ -186,8 +186,7 @@ CommandPalette::CommandPalette(GUI::Window& parent_window, ScreenPosition screen main_widget->set_frame_shape(Gfx::FrameShape::Window); main_widget->set_fill_with_background_color(true); - auto& layout = main_widget->set_layout(); - layout.set_margins(4); + main_widget->set_layout(4); m_text_box = main_widget->add(); m_table_view = main_widget->add(); diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp index 4d6ba70caf..b0a12d8777 100644 --- a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp +++ b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp @@ -219,9 +219,7 @@ void EmojiInputDialog::update_displayed_emoji() for (size_t row = 0; row < rows && index < m_emojis.size(); ++row) { auto& horizontal_container = m_emojis_widget->add(); horizontal_container.set_preferred_height(SpecialDimension::Fit); - - auto& horizontal_layout = horizontal_container.set_layout(); - horizontal_layout.set_spacing(0); + horizontal_container.set_layout(GUI::Margins {}, 0); for (size_t column = 0; column < columns; ++column) { bool found_match = false; diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp index 1417727e23..834a0f09c9 100644 --- a/Userland/Libraries/LibGUI/InputBox.cpp +++ b/Userland/Libraries/LibGUI/InputBox.cpp @@ -67,13 +67,10 @@ void InputBox::build() int title_width = widget->font().width(title()) + 24 /* icon, plus a little padding -- not perfect */; int max_width = max(text_width, title_width); - widget->set_layout(); + widget->set_layout(6, 6); widget->set_fill_with_background_color(true); widget->set_preferred_height(SpecialDimension::Fit); - widget->layout()->set_margins(6); - widget->layout()->set_spacing(6); - auto& label_editor_container = widget->add(); label_editor_container.set_layout(); label_editor_container.set_preferred_height(SpecialDimension::Fit); @@ -101,9 +98,8 @@ void InputBox::build() button_container_outer.set_layout(); auto& button_container_inner = button_container_outer.add(); - button_container_inner.set_layout(); + button_container_inner.set_layout(GUI::Margins {}, 6); button_container_inner.set_preferred_height(SpecialDimension::Fit); - button_container_inner.layout()->set_spacing(6); button_container_inner.add_spacer().release_value_but_fixme_should_propagate_errors(); m_ok_button = button_container_inner.add(); diff --git a/Userland/Libraries/LibGUI/MessageBox.cpp b/Userland/Libraries/LibGUI/MessageBox.cpp index b76692407a..b056a03d10 100644 --- a/Userland/Libraries/LibGUI/MessageBox.cpp +++ b/Userland/Libraries/LibGUI/MessageBox.cpp @@ -121,15 +121,11 @@ void MessageBox::build() int total_text_height = number_of_lines * padded_text_height; int icon_width = 0; - widget->set_layout(); + widget->set_layout(8, 6); widget->set_fill_with_background_color(true); - widget->layout()->set_margins(8); - widget->layout()->set_spacing(6); - auto& message_container = widget->add(); - message_container.set_layout(); - message_container.layout()->set_spacing(8); + message_container.set_layout(GUI::Margins {}, 8); if (m_type != Type::None) { auto& icon_image = message_container.add(); @@ -147,9 +143,8 @@ void MessageBox::build() label.set_text_alignment(Gfx::TextAlignment::CenterLeft); auto& button_container = widget->add(); - button_container.set_layout(); + button_container.set_layout(GUI::Margins {}, 8); button_container.set_fixed_height(24); - button_container.layout()->set_spacing(8); constexpr int button_width = 80; int button_count = 0; diff --git a/Userland/Libraries/LibGUI/ProcessChooser.cpp b/Userland/Libraries/LibGUI/ProcessChooser.cpp index 58f6d545ac..bbf8db72f1 100644 --- a/Userland/Libraries/LibGUI/ProcessChooser.cpp +++ b/Userland/Libraries/LibGUI/ProcessChooser.cpp @@ -48,8 +48,7 @@ ProcessChooser::ProcessChooser(StringView window_title, String button_label, Gfx auto& button_container = widget->add(); button_container.set_fixed_height(30); - button_container.set_layout(); - button_container.layout()->set_margins({ 0, 4, 0 }); + button_container.set_layout(GUI::Margins { 0, 4, 0 }); button_container.add_spacer().release_value_but_fixme_should_propagate_errors(); auto& select_button = button_container.add(m_button_label); diff --git a/Userland/Libraries/LibGUI/SettingsWindow.cpp b/Userland/Libraries/LibGUI/SettingsWindow.cpp index 3e35e1d18d..95bf8a7235 100644 --- a/Userland/Libraries/LibGUI/SettingsWindow.cpp +++ b/Userland/Libraries/LibGUI/SettingsWindow.cpp @@ -34,16 +34,13 @@ ErrorOr> SettingsWindow::create(DeprecatedString t auto main_widget = TRY(window->set_main_widget()); main_widget->set_fill_with_background_color(true); - (void)TRY(main_widget->try_set_layout()); - main_widget->layout()->set_margins(4); - main_widget->layout()->set_spacing(6); + (void)TRY(main_widget->try_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 }); - (void)TRY(button_container->try_set_layout()); - button_container->layout()->set_spacing(6); + (void)TRY(button_container->try_set_layout(GUI::Margins {}, 6)); if (show_defaults_button == ShowDefaultsButton::Yes) { window->m_reset_button = TRY(button_container->try_add(TRY(String::from_utf8("Defaults"sv)))); diff --git a/Userland/Libraries/LibGUI/Statusbar.cpp b/Userland/Libraries/LibGUI/Statusbar.cpp index 911c878d2c..3da3ef5423 100644 --- a/Userland/Libraries/LibGUI/Statusbar.cpp +++ b/Userland/Libraries/LibGUI/Statusbar.cpp @@ -20,9 +20,7 @@ namespace GUI { Statusbar::Statusbar(int count) { set_fixed_height(18); - set_layout(); - layout()->set_margins(0); - layout()->set_spacing(2); + set_layout(0, 2); m_corner = add(); set_segment_count(count); diff --git a/Userland/Libraries/LibGUI/Toolbar.cpp b/Userland/Libraries/LibGUI/Toolbar.cpp index d09306eb13..bf1ef4f83c 100644 --- a/Userland/Libraries/LibGUI/Toolbar.cpp +++ b/Userland/Libraries/LibGUI/Toolbar.cpp @@ -34,9 +34,7 @@ Toolbar::Toolbar(Orientation orientation, int button_size) else set_fixed_width(button_size); - set_layout(orientation); - layout()->set_spacing(0); - layout()->set_margins({ 2, 2, 2, 2 }); + set_layout(orientation, GUI::Margins { 2, 2, 2, 2 }, 0); } class ToolbarButton final : public Button { diff --git a/Userland/Libraries/LibGUI/ToolbarContainer.cpp b/Userland/Libraries/LibGUI/ToolbarContainer.cpp index a583bf593b..49c63b104b 100644 --- a/Userland/Libraries/LibGUI/ToolbarContainer.cpp +++ b/Userland/Libraries/LibGUI/ToolbarContainer.cpp @@ -23,8 +23,7 @@ ToolbarContainer::ToolbarContainer(Gfx::Orientation orientation) set_frame_shape(Gfx::FrameShape::Box); set_frame_shadow(Gfx::FrameShadow::Sunken); - auto& layout = set_layout(); - layout.set_spacing(2); + set_layout(GUI::Margins {}, 2); set_shrink_to_fit(true); } diff --git a/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp b/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp index 338ba3e27c..c054f7968e 100644 --- a/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp +++ b/Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp @@ -24,8 +24,7 @@ CoverWizardPage::CoverWizardPage() m_banner_image_widget->load_from_file("/res/graphics/wizard-banner-simple.png"sv); m_content_widget = add(); - m_content_widget->set_layout(); - m_content_widget->layout()->set_margins(20); + m_content_widget->set_layout(20); m_header_label = m_content_widget->add