From e11d17761846b04c8cd3d0fe1254f0a19bd3ae0e Mon Sep 17 00:00:00 2001 From: sin-ack Date: Tue, 17 Aug 2021 00:11:38 +0000 Subject: Userland+LibGUI: Add shorthand versions of the Margins constructor This allows for typing [8] instead of [8, 8, 8, 8] to specify the same margin on all edges, for example. The constructors follow CSS' style of specifying margins. The added constructors are: - Margins(int all): Sets the same margin on all edges. - Margins(int vertical, int horizontal): Sets the first argument to top and bottom margins, and the second argument to left and right margins. - Margins(int top, int vertical, int bottom): Sets the first argument to the top margin, the second argument to the left and right margins, and the third argument to the bottom margin. --- Userland/Applications/FileManager/DirectoryView.cpp | 2 +- Userland/Applications/FileManager/FileOperationProgress.gml | 2 +- Userland/Applications/FileManager/PropertiesWindow.cpp | 2 +- Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml | 2 +- Userland/Applications/FileManager/main.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Userland/Applications/FileManager') diff --git a/Userland/Applications/FileManager/DirectoryView.cpp b/Userland/Applications/FileManager/DirectoryView.cpp index b576ba49e0..72a740e5b4 100644 --- a/Userland/Applications/FileManager/DirectoryView.cpp +++ b/Userland/Applications/FileManager/DirectoryView.cpp @@ -134,7 +134,7 @@ DirectoryView::DirectoryView(Mode mode) , m_sorting_model(GUI::SortingProxyModel::create(m_model)) { set_active_widget(nullptr); - set_content_margins({ 2, 2, 2, 2 }); + set_content_margins(2); setup_actions(); diff --git a/Userland/Applications/FileManager/FileOperationProgress.gml b/Userland/Applications/FileManager/FileOperationProgress.gml index f90ca68e8a..77d0c3dc13 100644 --- a/Userland/Applications/FileManager/FileOperationProgress.gml +++ b/Userland/Applications/FileManager/FileOperationProgress.gml @@ -2,7 +2,7 @@ fill_with_background_color: true layout: @GUI::VerticalBoxLayout { - margins: [4, 4, 4, 4] + margins: [4] } @GUI::Widget { diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 13a9ba6b2a..64d3bb413a 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -32,7 +32,7 @@ PropertiesWindow::PropertiesWindow(String const& path, bool disable_rename, Wind auto& main_widget = set_main_widget(); main_widget.set_layout(); - main_widget.layout()->set_margins({ 4, 4, 4, 4 }); + main_widget.layout()->set_margins(4); main_widget.set_fill_with_background_color(true); set_rect({ 0, 0, 360, 420 }); diff --git a/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml b/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml index 142082911c..cb03b22cf1 100644 --- a/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml +++ b/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml @@ -1,6 +1,6 @@ @GUI::Widget { layout: @GUI::VerticalBoxLayout { - margins: [8, 12, 8, 12] + margins: [8, 12] spacing: 10 } diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 3c37b36cc9..7bc98ce3d4 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -443,12 +443,12 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio auto& toolbar_container = *widget.find_descendant_of_type_named("toolbar_container"); auto& main_toolbar = *widget.find_descendant_of_type_named("main_toolbar"); auto& location_toolbar = *widget.find_descendant_of_type_named("location_toolbar"); - location_toolbar.layout()->set_margins({ 3, 6, 3, 6 }); + location_toolbar.layout()->set_margins({ 3, 6 }); auto& location_textbox = *widget.find_descendant_of_type_named("location_textbox"); auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named("breadcrumb_toolbar"); - breadcrumb_toolbar.layout()->set_margins({ 0, 6, 0, 6 }); + breadcrumb_toolbar.layout()->set_margins({ 0, 6 }); auto& breadcrumbbar = *widget.find_descendant_of_type_named("breadcrumbbar"); auto& splitter = *widget.find_descendant_of_type_named("splitter"); -- cgit v1.2.3