From 54605794f97a905c40a56bd18f79abb7e8cdc7bc Mon Sep 17 00:00:00 2001 From: FrHun <28605587+frhun@users.noreply.github.com> Date: Wed, 15 Sep 2021 17:56:01 +0200 Subject: [PATCH] Applications: Remove border from GroupBox margins --- .../Applications/DisplaySettings/DesktopSettings.gml | 2 +- .../Applications/DisplaySettings/MonitorSettings.gml | 2 +- Userland/Applications/FontEditor/FontEditorWindow.gml | 2 +- .../Applications/FontEditor/NewFontDialogPage2.gml | 2 +- .../Applications/MailSettings/MailSettingsWindow.gml | 4 ++-- Userland/Applications/MouseSettings/Mouse.gml | 6 +++--- Userland/Applications/MouseSettings/Theme.gml | 2 +- Userland/Applications/PixelPaint/EditGuideDialog.gml | 2 +- .../Applications/PixelPaint/LayerPropertiesWidget.cpp | 2 +- Userland/Applications/PixelPaint/PixelPaintWindow.gml | 2 +- .../Applications/PixelPaint/ToolPropertiesWidget.cpp | 2 +- Userland/Applications/Spreadsheet/csv_export.gml | 9 +++------ Userland/Applications/Spreadsheet/csv_import.gml | 11 ++++------- .../Applications/Terminal/TerminalSettingsWindow.gml | 8 ++++---- Userland/Applications/TextEditor/TextEditorWindow.gml | 2 +- Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml | 2 +- .../Demos/WidgetGallery/GalleryGML/CursorsTab.gml | 2 +- Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml | 2 +- .../Demos/WidgetGallery/GalleryGML/SlidersTab.gml | 6 +++--- .../Demos/WidgetGallery/GalleryGML/WizardsTab.gml | 2 +- 20 files changed, 33 insertions(+), 39 deletions(-) diff --git a/Userland/Applications/DisplaySettings/DesktopSettings.gml b/Userland/Applications/DisplaySettings/DesktopSettings.gml index 4dc51279e4..1a9dc86c12 100644 --- a/Userland/Applications/DisplaySettings/DesktopSettings.gml +++ b/Userland/Applications/DisplaySettings/DesktopSettings.gml @@ -7,7 +7,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [24, 16, 6] + margins: [14, 14, 4] } title: "Workspaces" diff --git a/Userland/Applications/DisplaySettings/MonitorSettings.gml b/Userland/Applications/DisplaySettings/MonitorSettings.gml index 464d2d27db..653f9b8731 100644 --- a/Userland/Applications/DisplaySettings/MonitorSettings.gml +++ b/Userland/Applications/DisplaySettings/MonitorSettings.gml @@ -34,7 +34,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [24, 16, 6] + margins: [14, 14, 4] } title: "Screen settings" diff --git a/Userland/Applications/FontEditor/FontEditorWindow.gml b/Userland/Applications/FontEditor/FontEditorWindow.gml index cdc4b4d5d2..6a201e292b 100644 --- a/Userland/Applications/FontEditor/FontEditorWindow.gml +++ b/Userland/Applications/FontEditor/FontEditorWindow.gml @@ -75,7 +75,7 @@ title: "Metadata" fixed_height: 220 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8, 8] + margins: [6, 6, 6, 6] } @GUI::Widget { diff --git a/Userland/Applications/FontEditor/NewFontDialogPage2.gml b/Userland/Applications/FontEditor/NewFontDialogPage2.gml index 266741bb18..28f9c7c018 100644 --- a/Userland/Applications/FontEditor/NewFontDialogPage2.gml +++ b/Userland/Applications/FontEditor/NewFontDialogPage2.gml @@ -11,7 +11,7 @@ title: "Metadata" fixed_width: 200 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [4] } @GUI::Widget { diff --git a/Userland/Applications/MailSettings/MailSettingsWindow.gml b/Userland/Applications/MailSettings/MailSettingsWindow.gml index 410445fe20..4b82071e02 100644 --- a/Userland/Applications/MailSettings/MailSettingsWindow.gml +++ b/Userland/Applications/MailSettings/MailSettingsWindow.gml @@ -11,7 +11,7 @@ fixed_height: 170 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [6] spacing: 2 } @@ -101,7 +101,7 @@ fixed_height: 110 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [6] spacing: 2 } diff --git a/Userland/Applications/MouseSettings/Mouse.gml b/Userland/Applications/MouseSettings/Mouse.gml index 1daf2d4be7..7b64cbe993 100644 --- a/Userland/Applications/MouseSettings/Mouse.gml +++ b/Userland/Applications/MouseSettings/Mouse.gml @@ -11,7 +11,7 @@ fixed_height: 110 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [6] spacing: 2 } @@ -60,7 +60,7 @@ fixed_height: 110 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [6] spacing: 2 } @@ -114,7 +114,7 @@ fixed_height: 110 layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [6] spacing: 2 } diff --git a/Userland/Applications/MouseSettings/Theme.gml b/Userland/Applications/MouseSettings/Theme.gml index 70359c5102..851f647f17 100644 --- a/Userland/Applications/MouseSettings/Theme.gml +++ b/Userland/Applications/MouseSettings/Theme.gml @@ -9,7 +9,7 @@ title: "Available Cursor Themes" layout: @GUI::VerticalBoxLayout { - margins: [16, 8, 8] + margins: [6] spacing: 4 } diff --git a/Userland/Applications/PixelPaint/EditGuideDialog.gml b/Userland/Applications/PixelPaint/EditGuideDialog.gml index effd464e37..44945e5b29 100644 --- a/Userland/Applications/PixelPaint/EditGuideDialog.gml +++ b/Userland/Applications/PixelPaint/EditGuideDialog.gml @@ -14,7 +14,7 @@ shrink_to_fit: true layout: @GUI::HorizontalBoxLayout { - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::RadioButton { diff --git a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp index c0d1fbbb9d..2983860eea 100644 --- a/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp +++ b/Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp @@ -25,7 +25,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() auto& group_box = add("Layer properties"); auto& layout = group_box.set_layout(); - layout.set_margins({ 20, 10, 10 }); + layout.set_margins({ 8 }); auto& name_container = group_box.add(); name_container.set_fixed_height(20); diff --git a/Userland/Applications/PixelPaint/PixelPaintWindow.gml b/Userland/Applications/PixelPaint/PixelPaintWindow.gml index 04dd5a4a77..42dcfe56bf 100644 --- a/Userland/Applications/PixelPaint/PixelPaintWindow.gml +++ b/Userland/Applications/PixelPaint/PixelPaintWindow.gml @@ -51,7 +51,7 @@ @GUI::GroupBox { title: "Layers" layout: @GUI::VerticalBoxLayout { - margins: [16, 6, 6] + margins: [6] } @PixelPaint::LayerListWidget { diff --git a/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp b/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp index bc8d8a8eaa..eba4852b0b 100644 --- a/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp +++ b/Userland/Applications/PixelPaint/ToolPropertiesWidget.cpp @@ -19,7 +19,7 @@ ToolPropertiesWidget::ToolPropertiesWidget() m_group_box = add("Tool properties"); auto& layout = m_group_box->set_layout(); - layout.set_margins({ 20, 10, 10 }); + layout.set_margins({ 8 }); m_tool_widget_stack = m_group_box->add(); m_blank_widget = m_tool_widget_stack->add(); } diff --git a/Userland/Applications/Spreadsheet/csv_export.gml b/Userland/Applications/Spreadsheet/csv_export.gml index 4f0fa92ce0..a1dbd52eb1 100644 --- a/Userland/Applications/Spreadsheet/csv_export.gml +++ b/Userland/Applications/Spreadsheet/csv_export.gml @@ -18,8 +18,7 @@ title: "Delimiter" layout: @GUI::VerticalBoxLayout { - // FIXME: This is working around the fact that group boxes don't allocate space for their title and border! - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::RadioButton { @@ -69,8 +68,7 @@ title: "Quote" layout: @GUI::VerticalBoxLayout { - // FIXME: This is working around the fact that group boxes don't allocate space for their title and border! - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::RadioButton { @@ -151,8 +149,7 @@ fixed_width: 150 layout: @GUI::VerticalBoxLayout { - // FIXME: This is working around the fact that group boxes don't allocate space for their title and border! - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::TextEditor { diff --git a/Userland/Applications/Spreadsheet/csv_import.gml b/Userland/Applications/Spreadsheet/csv_import.gml index 80e6a99e2d..d22893b723 100644 --- a/Userland/Applications/Spreadsheet/csv_import.gml +++ b/Userland/Applications/Spreadsheet/csv_import.gml @@ -18,8 +18,7 @@ title: "Delimiter" layout: @GUI::VerticalBoxLayout { - // FIXME: This is working around the fact that group boxes don't allocate space for their title and border! - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::RadioButton { @@ -69,8 +68,7 @@ title: "Quote" layout: @GUI::VerticalBoxLayout { - // FIXME: This is working around the fact that group boxes don't allocate space for their title and border! - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::RadioButton { @@ -133,7 +131,7 @@ fixed_height: 40 layout: @GUI::VerticalBoxLayout { - margins: [6, 6, 0] + margins: [4, 4, 0] } @GUI::Widget { @@ -164,8 +162,7 @@ fixed_width: 150 layout: @GUI::VerticalBoxLayout { - // FIXME: This is working around the fact that group boxes don't allocate space for their title and border! - margins: [20, 10, 10] + margins: [10, 8, 8] } @GUI::StackWidget { diff --git a/Userland/Applications/Terminal/TerminalSettingsWindow.gml b/Userland/Applications/Terminal/TerminalSettingsWindow.gml index 33718a2e0b..632bf3e901 100644 --- a/Userland/Applications/Terminal/TerminalSettingsWindow.gml +++ b/Userland/Applications/Terminal/TerminalSettingsWindow.gml @@ -10,7 +10,7 @@ shrink_to_fit: true layout: @GUI::VerticalBoxLayout { - margins: [16, 6, 6] + margins: [4] } @GUI::RadioButton { @@ -34,7 +34,7 @@ shrink_to_fit: true layout: @GUI::VerticalBoxLayout { - margins: [16, 6, 6] + margins: [4] } @GUI::OpacitySlider { @@ -50,7 +50,7 @@ shrink_to_fit: true layout: @GUI::VerticalBoxLayout { - margins: [16, 6, 6] + margins: [4] } @GUI::SpinBox { @@ -66,7 +66,7 @@ shrink_to_fit: true layout: @GUI::VerticalBoxLayout { - margins: [16, 6, 6] + margins: [4] } @GUI::ComboBox { diff --git a/Userland/Applications/TextEditor/TextEditorWindow.gml b/Userland/Applications/TextEditor/TextEditorWindow.gml index 845770b8bd..37fa78c9f9 100644 --- a/Userland/Applications/TextEditor/TextEditorWindow.gml +++ b/Userland/Applications/TextEditor/TextEditorWindow.gml @@ -36,7 +36,7 @@ layout: @GUI::VerticalBoxLayout { spacing: 2 - margins: [5] + margins: [3] } @GUI::Widget { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml index b9028e3de7..b58fbc0cef 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml @@ -237,7 +237,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [8] + margins: [6] } @GUI::Widget { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml index 581cf2dac1..489f620ec1 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/CursorsTab.gml @@ -6,7 +6,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [8] + margins: [6] } @GUI::TableView { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml index 02e5cd8b20..7ca363af28 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/IconsTab.gml @@ -6,7 +6,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [8] + margins: [6] } @GUI::TableView { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml index e0c0a39be4..6a887211f2 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml @@ -7,7 +7,7 @@ @GUI::GroupBox { fixed_height: 129 layout: @GUI::VerticalBoxLayout { - margins: [8] + margins: [6] } @GUI::GroupBox { @@ -92,7 +92,7 @@ @GUI::GroupBox { layout: @GUI::HorizontalBoxLayout { - margins: [8] + margins: [6] } @GUI::VerticalProgressbar { @@ -140,7 +140,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [8] + margins: [6] } @GUI::Widget { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml index 5aece78f1c..873f3c37e0 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml @@ -6,7 +6,7 @@ @GUI::GroupBox { layout: @GUI::VerticalBoxLayout { - margins: [8] + margins: [6] } @GUI::Button {