diff options
| author | kleines Filmröllchen <filmroellchen@serenityos.org> | 2022-02-05 14:31:48 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-02-07 18:39:50 +0100 |
| commit | 6ee597369d950bd2835633ac3fe37d2da5ab4a56 (patch) | |
| tree | b313213e8141cb0798c32c37b9dd6f1d3ecc8de4 | |
| parent | 32de6dde4cc9bc6f07e9d158d7132f960cd174ac (diff) | |
| download | serenity-6ee597369d950bd2835633ac3fe37d2da5ab4a56.zip | |
Meta+Userland: Run the GML formatter on CI and pre-commit
Now that the GML formatter is both perserving comments and also mostly
agrees to the existing GML style, it can be used to auto-format all the
GML files in the system. This commit does not only contain the scripts
for running the formatting on CI and the pre-commit hook, but also
initially formats all the existing GML files so that the hook is
successfull.
60 files changed, 221 insertions, 552 deletions
diff --git a/Meta/lint-ci.sh b/Meta/lint-ci.sh index 2bb3bff369..84dc27328a 100755 --- a/Meta/lint-ci.sh +++ b/Meta/lint-ci.sh @@ -28,6 +28,7 @@ for cmd in \ Meta/lint-executable-resources.sh \ Meta/lint-keymaps.py \ Meta/lint-shell-scripts.sh \ + Meta/lint-gml-format.sh \ Meta/lint-prettier.sh \ Meta/lint-python.sh; do echo "Running ${cmd}... " diff --git a/Meta/lint-gml-format.sh b/Meta/lint-gml-format.sh new file mode 100755 index 0000000000..3c3a1c8108 --- /dev/null +++ b/Meta/lint-gml-format.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +set -e + +script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P) +cd "${script_path}/.." || exit 1 + +if [ -z "${GML_FORMAT:-}" ] ; then + if ! [ -d Build/lagom/ ] ; then + echo "Directory Build/lagom/ does not exist. Skipping GML formatting." + exit 0 + fi + if ! [ -r Build/lagom/gml-format ] ; then + echo "Lagom executable gml-format was not built. Skipping GML formatting." + echo "To enable this check, you may need to run './Meta/serenity.sh build lagom' first." + exit 0 + fi + GML_FORMAT="Build/lagom/gml-format" +fi + +find AK Base Documentation Kernel Meta Ports Tests Userland -type f -name '*.gml' -print0 | xargs -0 "${GML_FORMAT}" -i diff --git a/Userland/Applications/Browser/BrowserWindow.gml b/Userland/Applications/Browser/BrowserWindow.gml index d8360a9583..f02adc0630 100644 --- a/Userland/Applications/Browser/BrowserWindow.gml +++ b/Userland/Applications/Browser/BrowserWindow.gml @@ -1,7 +1,6 @@ @GUI::Widget { name: "browser" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout @GUI::HorizontalSeparator { diff --git a/Userland/Applications/Browser/EditBookmark.gml b/Userland/Applications/Browser/EditBookmark.gml index 86134dfe8e..c6e41cc796 100644 --- a/Userland/Applications/Browser/EditBookmark.gml +++ b/Userland/Applications/Browser/EditBookmark.gml @@ -2,17 +2,13 @@ fixed_width: 260 fixed_height: 85 fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] } - @GUI::Widget { fixed_height: 24 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Title:" @@ -27,9 +23,7 @@ @GUI::Widget { fixed_height: 24 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "URL:" @@ -42,15 +36,11 @@ } } - @GUI::Widget { fixed_height: 24 + layout: @GUI::HorizontalBoxLayout - layout: @GUI::HorizontalBoxLayout { - } - - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/Browser/Tab.gml b/Userland/Applications/Browser/Tab.gml index 5a11fcdc4e..d6c3ea135a 100644 --- a/Userland/Applications/Browser/Tab.gml +++ b/Userland/Applications/Browser/Tab.gml @@ -5,7 +5,6 @@ @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::Toolbar { name: "toolbar" } @@ -13,8 +12,8 @@ @GUI::Widget { name: "webview_container" - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout + } @GUI::Statusbar { diff --git a/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml b/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml index 520dba6a8c..1583cdc5bf 100644 --- a/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml +++ b/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml @@ -1,6 +1,5 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -9,7 +8,6 @@ @GUI::GroupBox { title: "Homepage" fixed_height: 70 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 2 @@ -42,7 +40,6 @@ @GUI::GroupBox { title: "Appearance" fixed_height: 104 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 2 @@ -89,7 +86,6 @@ @GUI::GroupBox { title: "Search Engine" fixed_height: 140 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 2 @@ -118,7 +114,6 @@ } name: "search_engine_combobox_group" - @GUI::Widget { fixed_width: 32 } @@ -140,7 +135,6 @@ } name: "custom_search_engine_group" - @GUI::Widget { fixed_width: 32 } @@ -161,7 +155,6 @@ @GUI::GroupBox { title: "Downloads" fixed_height: 70 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 2 diff --git a/Userland/Applications/Calendar/CalendarWindow.gml b/Userland/Applications/Calendar/CalendarWindow.gml index f8feb0f3b3..b47d8ed320 100644 --- a/Userland/Applications/Calendar/CalendarWindow.gml +++ b/Userland/Applications/Calendar/CalendarWindow.gml @@ -1,11 +1,9 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::Toolbar { name: "toolbar" } diff --git a/Userland/Applications/CharacterMap/CharacterMapWindow.gml b/Userland/Applications/CharacterMap/CharacterMapWindow.gml index 0b4b211af1..7b7cc5de44 100644 --- a/Userland/Applications/CharacterMap/CharacterMapWindow.gml +++ b/Userland/Applications/CharacterMap/CharacterMapWindow.gml @@ -1,8 +1,6 @@ @GUI::Frame { fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::ToolbarContainer { @GUI::Toolbar { @@ -12,7 +10,6 @@ } name: "toolbar" - @GUI::Label { text: "Font: " autosize: true @@ -22,9 +19,7 @@ background_role: "Base" fill_with_background_color: true fixed_height: 20 - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { name: "font_name" @@ -40,7 +35,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { spacing: 4 margins: [0, 2, 0, 2] diff --git a/Userland/Applications/CharacterMap/CharacterSearchWindow.gml b/Userland/Applications/CharacterMap/CharacterSearchWindow.gml index 4024dca2ea..e8cb9c6510 100644 --- a/Userland/Applications/CharacterMap/CharacterSearchWindow.gml +++ b/Userland/Applications/CharacterMap/CharacterSearchWindow.gml @@ -1,13 +1,12 @@ @GUI::Frame { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout fill_with_background_color: true - @GUI::Toolbar { @GUI::TextBox { name: "search_input" } + @GUI::Button { name: "search_button" icon: "/res/icons/16x16/find.png" diff --git a/Userland/Applications/ClockSettings/ClockSettingsWidget.gml b/Userland/Applications/ClockSettings/ClockSettingsWidget.gml index 1c4c5aa790..f0b10cd4a8 100644 --- a/Userland/Applications/ClockSettings/ClockSettingsWidget.gml +++ b/Userland/Applications/ClockSettings/ClockSettingsWidget.gml @@ -1,6 +1,5 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -8,7 +7,6 @@ @GUI::GroupBox { title: "Time Zone Settings" - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 16 diff --git a/Userland/Applications/CrashReporter/CrashReporterWindow.gml b/Userland/Applications/CrashReporter/CrashReporterWindow.gml index 529c390bda..79844b5fd5 100644 --- a/Userland/Applications/CrashReporter/CrashReporterWindow.gml +++ b/Userland/Applications/CrashReporter/CrashReporterWindow.gml @@ -1,13 +1,11 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [5] } @GUI::Widget { fixed_height: 44 - layout: @GUI::HorizontalBoxLayout { spacing: 10 } @@ -24,7 +22,6 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout @GUI::Label { @@ -41,7 +38,6 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout @GUI::Label { @@ -58,7 +54,6 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout @GUI::Label { @@ -85,7 +80,6 @@ @GUI::Widget { fixed_height: 32 - layout: @GUI::HorizontalBoxLayout @GUI::Button { diff --git a/Userland/Applications/DisplaySettings/BackgroundSettings.gml b/Userland/Applications/DisplaySettings/BackgroundSettings.gml index 8b06a18e3a..f7a179a0ec 100644 --- a/Userland/Applications/DisplaySettings/BackgroundSettings.gml +++ b/Userland/Applications/DisplaySettings/BackgroundSettings.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [8] } @@ -33,9 +32,7 @@ @GUI::Widget { shrink_to_fit: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Button { name: "wallpaper_open_button" diff --git a/Userland/Applications/DisplaySettings/DesktopSettings.gml b/Userland/Applications/DisplaySettings/DesktopSettings.gml index 00983ae0ef..adc4be09a8 100644 --- a/Userland/Applications/DisplaySettings/DesktopSettings.gml +++ b/Userland/Applications/DisplaySettings/DesktopSettings.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [8] } @@ -12,10 +11,8 @@ title: "Workspaces" shrink_to_fit: true - @GUI::Widget { fixed_height: 32 - layout: @GUI::HorizontalBoxLayout { margins: [6] } @@ -47,9 +44,7 @@ @GUI::Widget { fixed_height: 76 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_height: 32 diff --git a/Userland/Applications/DisplaySettings/FontSettings.gml b/Userland/Applications/DisplaySettings/FontSettings.gml index 279012364e..a78178f2b1 100644 --- a/Userland/Applications/DisplaySettings/FontSettings.gml +++ b/Userland/Applications/DisplaySettings/FontSettings.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [8] spacing: 8 @@ -8,7 +7,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { spacing: 6 } @@ -22,9 +20,7 @@ @GUI::Frame { background_role: "Base" fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { name: "default_font_label" @@ -40,7 +36,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { spacing: 6 } @@ -54,9 +49,7 @@ @GUI::Frame { background_role: "Base" fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { name: "fixed_width_font_label" @@ -70,6 +63,5 @@ } } - @GUI::Widget { - } + @GUI::Widget } diff --git a/Userland/Applications/DisplaySettings/MonitorSettings.gml b/Userland/Applications/DisplaySettings/MonitorSettings.gml index e03f842e19..7fd9fa4fe3 100644 --- a/Userland/Applications/DisplaySettings/MonitorSettings.gml +++ b/Userland/Applications/DisplaySettings/MonitorSettings.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [8] } @@ -38,12 +37,9 @@ } title: "Screen settings" - @GUI::Widget { shrink_to_fit: true - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Resolution:" @@ -69,9 +65,7 @@ @GUI::Widget { shrink_to_fit: true - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Display scale:" diff --git a/Userland/Applications/FileManager/FileManagerWindow.gml b/Userland/Applications/FileManager/FileManagerWindow.gml index b54beefc35..e613767644 100644 --- a/Userland/Applications/FileManager/FileManagerWindow.gml +++ b/Userland/Applications/FileManager/FileManagerWindow.gml @@ -9,10 +9,10 @@ @GUI::Toolbar { name: "main_toolbar" } + @GUI::Toolbar { name: "location_toolbar" visible: false - @GUI::Label { text: "Location: " autosize: true @@ -23,9 +23,9 @@ fixed_height: 22 } } + @GUI::Toolbar { name: "breadcrumb_toolbar" - @GUI::Label { text: "Location: " autosize: true @@ -40,17 +40,14 @@ @GUI::HorizontalSplitter { name: "splitter" first_resizee_minimum_size: 80 - @GUI::TreeView { name: "tree_view" fixed_width: 175 } - } @GUI::Statusbar { name: "statusbar" - @GUI::Progressbar { name: "progressbar" text: "Generating thumbnails: " diff --git a/Userland/Applications/FileManager/FileOperationProgress.gml b/Userland/Applications/FileManager/FileOperationProgress.gml index 77d0c3dc13..7a864bd08a 100644 --- a/Userland/Applications/FileManager/FileOperationProgress.gml +++ b/Userland/Applications/FileManager/FileOperationProgress.gml @@ -1,15 +1,12 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] } @GUI::Widget { fixed_height: 32 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::ImageWidget { name: "source_folder_icon" @@ -38,9 +35,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Copying: " @@ -59,9 +54,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Time left: " @@ -89,11 +82,9 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Button { text: "Cancel" diff --git a/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml b/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml index cb03b22cf1..e10888a620 100644 --- a/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml +++ b/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml @@ -6,7 +6,6 @@ @GUI::Widget { fixed_height: 34 - layout: @GUI::HorizontalBoxLayout { spacing: 20 } @@ -23,12 +22,10 @@ } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -48,7 +45,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -69,7 +65,6 @@ @GUI::Widget { name: "link_location_widget" fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -89,7 +84,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -109,7 +103,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -129,7 +122,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -149,7 +141,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -169,7 +160,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -187,12 +177,10 @@ } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -221,7 +209,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } @@ -250,7 +237,6 @@ @GUI::Widget { fixed_height: 14 - layout: @GUI::HorizontalBoxLayout { spacing: 12 } diff --git a/Userland/Applications/FontEditor/FontEditorWindow.gml b/Userland/Applications/FontEditor/FontEditorWindow.gml index 105f358684..fec2379770 100644 --- a/Userland/Applications/FontEditor/FontEditorWindow.gml +++ b/Userland/Applications/FontEditor/FontEditorWindow.gml @@ -1,40 +1,32 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 } @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::Toolbar { name: "toolbar" } } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { name: "left_column_container" - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { name: "glyph_editor_container" + layout: @GUI::VerticalBoxLayout - layout: @GUI::VerticalBoxLayout { - } } @GUI::Widget { shrink_to_fit: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::SpinBox { name: "glyph_editor_width_spinbox" @@ -49,7 +41,6 @@ @GUI::ToolbarContainer { name: "glyph_toolbar_container" - @GUI::Toolbar { name: "glyph_mode_toolbar" } @@ -62,32 +53,27 @@ @GUI::Widget { name: "right_column_container" - layout: @GUI::VerticalBoxLayout { spacing: 6 } @GUI::Widget { name: "glyph_map_container" + layout: @GUI::VerticalBoxLayout - layout: @GUI::VerticalBoxLayout { - } } @GUI::GroupBox { name: "font_metadata_groupbox" title: "Metadata" shrink_to_fit: true - layout: @GUI::VerticalBoxLayout { margins: [6, 6, 6, 6] } @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "name_label" @@ -103,9 +89,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "family_label" @@ -121,9 +105,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "weight_label" @@ -140,9 +122,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "slope_label" @@ -159,9 +139,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "presentation_label" @@ -179,9 +157,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "mean_line_label" @@ -198,9 +174,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "baseline_label" @@ -217,9 +191,7 @@ @GUI::Widget { fixed_height: 22 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "spacing_label" diff --git a/Userland/Applications/FontEditor/NewFontDialogPage1.gml b/Userland/Applications/FontEditor/NewFontDialogPage1.gml index d08c7f3531..5501dbe2d2 100644 --- a/Userland/Applications/FontEditor/NewFontDialogPage1.gml +++ b/Userland/Applications/FontEditor/NewFontDialogPage1.gml @@ -5,12 +5,10 @@ @GUI::Widget { fixed_height: 160 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 100 @@ -24,8 +22,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 100 @@ -43,8 +40,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Weight:" @@ -60,8 +56,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 100 @@ -77,8 +72,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 100 diff --git a/Userland/Applications/FontEditor/NewFontDialogPage2.gml b/Userland/Applications/FontEditor/NewFontDialogPage2.gml index abf3c04f67..5b2b9c0fbb 100644 --- a/Userland/Applications/FontEditor/NewFontDialogPage2.gml +++ b/Userland/Applications/FontEditor/NewFontDialogPage2.gml @@ -4,8 +4,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::GroupBox { title: "Metadata" @@ -15,8 +14,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 80 @@ -31,8 +29,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 80 @@ -47,8 +44,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 80 @@ -63,8 +59,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 80 @@ -83,8 +78,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { fixed_width: 80 @@ -101,8 +95,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { fixed_width: 80 @@ -117,21 +110,19 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Widget { name: "glyph_editor_container" layout: @GUI::VerticalBoxLayout { margins: [5, 0, 0] } - } - @GUI::Widget { } + + @GUI::Widget } } } diff --git a/Userland/Applications/HexEditor/FindDialog.gml b/Userland/Applications/HexEditor/FindDialog.gml index f3b9aac85f..5afcea8a24 100644 --- a/Userland/Applications/HexEditor/FindDialog.gml +++ b/Userland/Applications/HexEditor/FindDialog.gml @@ -3,7 +3,6 @@ fixed_width: 280 fixed_height: 146 fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 margins: [4] @@ -11,8 +10,8 @@ @GUI::Widget { layout: @GUI::HorizontalBoxLayout - fixed_height: 22 + fixed_height: 22 @GUI::Label { text: "Value to find" fixed_width: 80 @@ -32,8 +31,8 @@ @GUI::Widget { layout: @GUI::HorizontalBoxLayout - fixed_height: 22 + fixed_height: 22 @GUI::Button { name: "find_button" text: "Find" diff --git a/Userland/Applications/HexEditor/GoToOffsetDialog.gml b/Userland/Applications/HexEditor/GoToOffsetDialog.gml index 1828e782e3..cfd7d9495f 100644 --- a/Userland/Applications/HexEditor/GoToOffsetDialog.gml +++ b/Userland/Applications/HexEditor/GoToOffsetDialog.gml @@ -3,7 +3,6 @@ fixed_width: 300 fixed_height: 80 fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 margins: [0] diff --git a/Userland/Applications/HexEditor/HexEditorWindow.gml b/Userland/Applications/HexEditor/HexEditorWindow.gml index e51b8ea3ed..467ff0176a 100644 --- a/Userland/Applications/HexEditor/HexEditorWindow.gml +++ b/Userland/Applications/HexEditor/HexEditorWindow.gml @@ -1,14 +1,12 @@ @GUI::Widget { name: "main" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 } @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::Toolbar { name: "toolbar" } @@ -22,9 +20,7 @@ @GUI::Widget { name: "search_results_container" visible: false - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::TableView { name: "search_results" diff --git a/Userland/Applications/KeyboardSettings/Keyboard.gml b/Userland/Applications/KeyboardSettings/Keyboard.gml index 261ce8513b..1437c98666 100644 --- a/Userland/Applications/KeyboardSettings/Keyboard.gml +++ b/Userland/Applications/KeyboardSettings/Keyboard.gml @@ -1,6 +1,5 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -9,7 +8,6 @@ @GUI::GroupBox { title: "Mapping" fixed_height: 150 - layout: @GUI::HorizontalBoxLayout { margins: [16, 8, 8] spacing: 16 @@ -17,8 +15,7 @@ @GUI::Widget { fixed_width: 32 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { fixed_width: 32 @@ -38,7 +35,6 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout { spacing: 4 } @@ -59,7 +55,6 @@ @GUI::GroupBox { title: "Test input" - layout: @GUI::HorizontalBoxLayout { margins: [16, 8, 8] spacing: 16 @@ -67,8 +62,7 @@ @GUI::Widget { fixed_width: 32 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { fixed_width: 32 @@ -84,7 +78,6 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout { spacing: 16 } @@ -110,7 +103,6 @@ @GUI::GroupBox { title: "Num Lock" fixed_height: 60 - layout: @GUI::HorizontalBoxLayout { margins: [16, 8, 8] spacing: 16 diff --git a/Userland/Applications/KeyboardSettings/KeymapDialog.gml b/Userland/Applications/KeyboardSettings/KeymapDialog.gml index 71e1efbe62..c1062d0fd2 100644 --- a/Userland/Applications/KeyboardSettings/KeymapDialog.gml +++ b/Userland/Applications/KeyboardSettings/KeymapDialog.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] } @@ -11,12 +10,9 @@ @GUI::Widget { fixed_height: 24 + layout: @GUI::HorizontalBoxLayout - layout: @GUI::HorizontalBoxLayout { - } - - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/Mail/MailWindow.gml b/Userland/Applications/Mail/MailWindow.gml index c6d8b47367..f011048732 100644 --- a/Userland/Applications/Mail/MailWindow.gml +++ b/Userland/Applications/Mail/MailWindow.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 } diff --git a/Userland/Applications/MailSettings/MailSettingsWidget.gml b/Userland/Applications/MailSettings/MailSettingsWidget.gml index 4911756702..e20b384afd 100644 --- a/Userland/Applications/MailSettings/MailSettingsWidget.gml +++ b/Userland/Applications/MailSettings/MailSettingsWidget.gml @@ -1,6 +1,5 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -9,7 +8,6 @@ @GUI::GroupBox { title: "Server Settings" fixed_height: 170 - layout: @GUI::VerticalBoxLayout { margins: [6] spacing: 2 @@ -93,7 +91,6 @@ @GUI::GroupBox { title: "User Settings" fixed_height: 110 - layout: @GUI::VerticalBoxLayout { margins: [6] spacing: 2 diff --git a/Userland/Applications/MouseSettings/Mouse.gml b/Userland/Applications/MouseSettings/Mouse.gml index fc445c1e3e..7ae4faadef 100644 --- a/Userland/Applications/MouseSettings/Mouse.gml +++ b/Userland/Applications/MouseSettings/Mouse.gml @@ -1,6 +1,5 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -9,7 +8,6 @@ @GUI::GroupBox { title: "Cursor speed" fixed_height: 106 - layout: @GUI::VerticalBoxLayout { margins: [6] spacing: 2 @@ -58,7 +56,6 @@ @GUI::GroupBox { title: "Scroll wheel step size" fixed_height: 106 - layout: @GUI::VerticalBoxLayout { margins: [6] spacing: 2 @@ -104,15 +101,13 @@ fixed_width: 100 } - @GUI::Widget { - } + @GUI::Widget } } @GUI::GroupBox { title: "Double-click speed" fixed_height: 106 - layout: @GUI::VerticalBoxLayout { margins: [6] spacing: 2 @@ -162,7 +157,6 @@ @GUI::GroupBox { title: "Button configuration" fixed_height: 68 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 2 diff --git a/Userland/Applications/MouseSettings/Theme.gml b/Userland/Applications/MouseSettings/Theme.gml index 851f647f17..fe144e01cc 100644 --- a/Userland/Applications/MouseSettings/Theme.gml +++ b/Userland/Applications/MouseSettings/Theme.gml @@ -1,13 +1,11 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] } @GUI::GroupBox { title: "Available Cursor Themes" - layout: @GUI::VerticalBoxLayout { margins: [6] spacing: 4 @@ -15,7 +13,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { spacing: 8 } diff --git a/Userland/Applications/PixelPaint/EditGuideDialog.gml b/Userland/Applications/PixelPaint/EditGuideDialog.gml index 44945e5b29..222ef1a51b 100644 --- a/Userland/Applications/PixelPaint/EditGuideDialog.gml +++ b/Userland/Applications/PixelPaint/EditGuideDialog.gml @@ -1,8 +1,6 @@ @GUI::Frame { fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { layout: @GUI::VerticalBoxLayout { @@ -12,7 +10,6 @@ @GUI::GroupBox { title: "Orientation" shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { margins: [10, 8, 8] } @@ -33,8 +30,8 @@ layout: @GUI::HorizontalBoxLayout { margins: [4] } - shrink_to_fit: true + shrink_to_fit: true @GUI::Label { text: "Offset" text_alignment: "CenterLeft" @@ -45,16 +42,13 @@ } } - @GUI::Widget { max_height: 24 - layout: @GUI::HorizontalBoxLayout { margins: [4] } - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/PixelPaint/FilterGallery.gml b/Userland/Applications/PixelPaint/FilterGallery.gml index 609830e48f..833b95aa31 100644 --- a/Userland/Applications/PixelPaint/FilterGallery.gml +++ b/Userland/Applications/PixelPaint/FilterGallery.gml @@ -1,15 +1,12 @@ @GUI::Frame { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout fill_with_background_color: true - @GUI::Widget { - - layout:@GUI::HorizontalBoxLayout { + layout: @GUI::HorizontalBoxLayout { margins: [4] } - + @GUI::TreeView { name: "tree_view" fixed_width: 200 @@ -17,22 +14,20 @@ @GUI::Widget { name: "config_widget" - - layout:@GUI::VerticalBoxLayout { + layout: @GUI::VerticalBoxLayout { margins: [4] } - } + } } @GUI::Widget { max_height: 24 - - layout:@GUI::HorizontalBoxLayout { + layout: @GUI::HorizontalBoxLayout { margins: [4] } - @GUI::Widget {} + @GUI::Widget @GUI::Button { name: "apply_button" diff --git a/Userland/Applications/PixelPaint/PixelPaintWindow.gml b/Userland/Applications/PixelPaint/PixelPaintWindow.gml index 42dcfe56bf..b06b31405a 100644 --- a/Userland/Applications/PixelPaint/PixelPaintWindow.gml +++ b/Userland/Applications/PixelPaint/PixelPaintWindow.gml @@ -1,14 +1,12 @@ @GUI::Widget { name: "main" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 } @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::Toolbar { name: "toolbar" } @@ -21,7 +19,6 @@ @GUI::ToolbarContainer { name: "toolbar_container" - @PixelPaint::ToolboxWidget { name: "toolbox" } @@ -44,9 +41,7 @@ @GUI::Widget { fill_with_background_color: true fixed_width: 200 - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::GroupBox { title: "Layers" diff --git a/Userland/Applications/Run/Run.gml b/Userland/Applications/Run/Run.gml index 99030fb934..64cd5192d4 100644 --- a/Userland/Applications/Run/Run.gml +++ b/Userland/Applications/Run/Run.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] } @@ -40,8 +39,8 @@ @GUI::Widget { layout: @GUI::HorizontalBoxLayout - fixed_height: 22 + fixed_height: 22 // HACK: using an empty widget as a spacer @GUI::Widget diff --git a/Userland/Applications/Spreadsheet/CondFormatting.gml b/Userland/Applications/Spreadsheet/CondFormatting.gml index 9157968007..4072874b36 100644 --- a/Userland/Applications/Spreadsheet/CondFormatting.gml +++ b/Userland/Applications/Spreadsheet/CondFormatting.gml @@ -1,7 +1,6 @@ @GUI::Widget { name: "main" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] spacing: 4 @@ -13,7 +12,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { spacing: 10 } diff --git a/Userland/Applications/Spreadsheet/CondView.gml b/Userland/Applications/Spreadsheet/CondView.gml index a17e15d14b..737ce4b9ee 100644 --- a/Userland/Applications/Spreadsheet/CondView.gml +++ b/Userland/Applications/Spreadsheet/CondView.gml @@ -3,7 +3,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout @GUI::Label { @@ -21,7 +20,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout @GUI::Label { @@ -36,7 +34,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout @GUI::Label { diff --git a/Userland/Applications/Spreadsheet/csv_export.gml b/Userland/Applications/Spreadsheet/csv_export.gml index a1dbd52eb1..975ce6e846 100644 --- a/Userland/Applications/Spreadsheet/csv_export.gml +++ b/Userland/Applications/Spreadsheet/csv_export.gml @@ -6,17 +6,13 @@ @GUI::HorizontalSplitter { @GUI::Widget { name: "csv_options" - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::GroupBox { title: "Delimiter" - layout: @GUI::VerticalBoxLayout { margins: [10, 8, 8] } @@ -47,9 +43,7 @@ @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::RadioButton { name: "delimiter_other_radio" @@ -66,7 +60,6 @@ @GUI::GroupBox { title: "Quote" - layout: @GUI::VerticalBoxLayout { margins: [10, 8, 8] } @@ -85,9 +78,7 @@ @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::RadioButton { name: "quote_other_radio" @@ -101,14 +92,11 @@ } } - @GUI::Widget { - } + @GUI::Widget @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Escape by " @@ -121,16 +109,13 @@ } } - @GUI::Widget { - } + @GUI::Widget } } @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::CheckBox { name: "export_header_check_box" @@ -147,7 +132,6 @@ @GUI::GroupBox { title: "Data Preview" fixed_width: 150 - layout: @GUI::VerticalBoxLayout { margins: [10, 8, 8] } diff --git a/Userland/Applications/Spreadsheet/csv_import.gml b/Userland/Applications/Spreadsheet/csv_import.gml index d22893b723..996f826955 100644 --- a/Userland/Applications/Spreadsheet/csv_import.gml +++ b/Userland/Applications/Spreadsheet/csv_import.gml @@ -6,17 +6,13 @@ @GUI::HorizontalSplitter { @GUI::Widget { name: "csv_options" - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::GroupBox { title: "Delimiter" - layout: @GUI::VerticalBoxLayout { margins: [10, 8, 8] } @@ -47,9 +43,7 @@ @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::RadioButton { name: "delimiter_other_radio" @@ -66,7 +60,6 @@ @GUI::GroupBox { title: "Quote" - layout: @GUI::VerticalBoxLayout { margins: [10, 8, 8] } @@ -85,9 +78,7 @@ @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::RadioButton { name: "quote_other_radio" @@ -101,14 +92,11 @@ } } - @GUI::Widget { - } + @GUI::Widget @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Escape by " @@ -121,22 +109,19 @@ } } - @GUI::Widget { - } + @GUI::Widget } } @GUI::GroupBox { title: "Trim Field Spaces" fixed_height: 40 - layout: @GUI::VerticalBoxLayout { margins: [4, 4, 0] } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::CheckBox { name: "trim_leading_field_spaces_check_box" @@ -160,17 +145,16 @@ @GUI::GroupBox { title: "Data Preview" fixed_width: 150 - layout: @GUI::VerticalBoxLayout { margins: [10, 8, 8] } @GUI::StackWidget { name: "data_preview_widget" - @GUI::TableView { name: "data_preview_table_view" } + @GUI::Label { name: "data_preview_error_label" word_wrap: true diff --git a/Userland/Applications/Spreadsheet/select_format_page.gml b/Userland/Applications/Spreadsheet/select_format_page.gml index 9e88191a99..f1335eaed5 100644 --- a/Userland/Applications/Spreadsheet/select_format_page.gml +++ b/Userland/Applications/Spreadsheet/select_format_page.gml @@ -1,6 +1,5 @@ @GUI::Widget { name: "select_format" - layout: @GUI::VerticalBoxLayout { margins: [20] } @@ -13,9 +12,7 @@ @GUI::Widget { fixed_height: 25 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Type: " @@ -28,6 +25,5 @@ } } - @GUI::Widget { - } + @GUI::Widget } diff --git a/Userland/Applications/TerminalSettings/TerminalSettingsMain.gml b/Userland/Applications/TerminalSettings/TerminalSettingsMain.gml index dddb7dadb6..ba87b0974c 100644 --- a/Userland/Applications/TerminalSettings/TerminalSettingsMain.gml +++ b/Userland/Applications/TerminalSettings/TerminalSettingsMain.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -10,7 +9,6 @@ title: "Bell Mode" shrink_to_fit: false fixed_height: 160 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 16 @@ -23,7 +21,6 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::VerticalBoxLayout { spacing: 4 } @@ -48,12 +45,11 @@ @GUI::GroupBox { title: "Scrollback Size (Lines)" shrink_to_fit: true - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] } - @GUI::CheckBox { + @GUI::CheckBox { name: "terminal_show_scrollbar" text: "Show scrollbar" } diff --git a/Userland/Applications/TerminalSettings/TerminalSettingsView.gml b/Userland/Applications/TerminalSettings/TerminalSettingsView.gml index a6140d4245..a47459d673 100644 --- a/Userland/Applications/TerminalSettings/TerminalSettingsView.gml +++ b/Userland/Applications/TerminalSettings/TerminalSettingsView.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [10] spacing: 5 @@ -9,7 +8,6 @@ @GUI::GroupBox { title: "Background Opacity" fixed_height: 70 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 16 @@ -26,7 +24,6 @@ @GUI::GroupBox { title: "Terminal Font" fixed_height: 100 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 16 @@ -40,7 +37,6 @@ @GUI::Widget { shrink_to_fit: true name: "terminal_font_selection" - layout: @GUI::HorizontalBoxLayout { spacing: 6 } @@ -48,9 +44,7 @@ @GUI::Frame { background_role: "Base" fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { name: "terminal_font_label" @@ -68,7 +62,6 @@ @GUI::GroupBox { title: "Color Scheme" fixed_height: 70 - layout: @GUI::VerticalBoxLayout { margins: [16, 8, 8] spacing: 16 diff --git a/Userland/Applications/TextEditor/TextEditorWindow.gml b/Userland/Applications/TextEditor/TextEditorWindow.gml index 37fa78c9f9..ed700973fb 100644 --- a/Userland/Applications/TextEditor/TextEditorWindow.gml +++ b/Userland/Applications/TextEditor/TextEditorWindow.gml @@ -1,14 +1,12 @@ @GUI::Widget { name: "main" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 2 } @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::Toolbar { name: "toolbar" } @@ -22,9 +20,8 @@ @GUI::Widget { name: "web_view_container" visible: false + layout: @GUI::VerticalBoxLayout - layout: @GUI::VerticalBoxLayout { - } } } @@ -33,7 +30,6 @@ visible: false fill_with_background_color: true fixed_height: 56 - layout: @GUI::VerticalBoxLayout { spacing: 2 margins: [3] @@ -43,7 +39,6 @@ name: "find_widget" fill_with_background_color: true fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { spacing: 4 } @@ -79,7 +74,6 @@ name: "replace_widget" fill_with_background_color: true fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { spacing: 4 } diff --git a/Userland/Applications/ThemeEditor/ThemeEditor.gml b/Userland/Applications/ThemeEditor/ThemeEditor.gml index 9e3aab90f2..022cced5a5 100644 --- a/Userland/Applications/ThemeEditor/ThemeEditor.gml +++ b/Userland/Applications/ThemeEditor/ThemeEditor.gml @@ -1,9 +1,10 @@ @GUI::Widget { layout: @GUI::VerticalBoxLayout - fill_with_background_color: true + fill_with_background_color: true @GUI::Frame { layout: @GUI::HorizontalBoxLayout + name: "preview_frame" } @@ -11,9 +12,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } + shrink_to_fit: true title: "Colors" - @GUI::ComboBox { name: "color_combo_box" model_only: true @@ -29,9 +30,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } + shrink_to_fit: true title: "Alignments" - @GUI::ComboBox { name: "alignment_combo_box" model_only: true @@ -47,17 +48,16 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } + shrink_to_fit: true title: "Flags" - @GUI::ComboBox { name: "flag_combo_box" model_only: true fixed_width: 230 } - @GUI::Widget { - } + @GUI::Widget @GUI::CheckBox { name: "flag_input" @@ -69,9 +69,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } + shrink_to_fit: true title: "Metrics" - @GUI::ComboBox { name: "metric_combo_box" model_only: true @@ -87,9 +87,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } + shrink_to_fit: true title: "Paths" - @GUI::ComboBox { name: "path_combo_box" model_only: true diff --git a/Userland/Applications/Welcome/WelcomeWindow.gml b/Userland/Applications/Welcome/WelcomeWindow.gml index 77b7394aa5..014a2dd413 100644 --- a/Userland/Applications/Welcome/WelcomeWindow.gml +++ b/Userland/Applications/Welcome/WelcomeWindow.gml @@ -99,10 +99,9 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout - @GUI::CheckBox{ + @GUI::CheckBox { name: "startup_checkbox" text: "Show Welcome the next time SerenityOS starts" autosize: true diff --git a/Userland/Demos/ModelGallery/BasicModelTab.gml b/Userland/Demos/ModelGallery/BasicModelTab.gml index f645563a52..ebb6ef0c26 100644 --- a/Userland/Demos/ModelGallery/BasicModelTab.gml +++ b/Userland/Demos/ModelGallery/BasicModelTab.gml @@ -7,7 +7,6 @@ @GUI::Label { text: "Here is a basic model, displayed on a table widget. Its clients are updated via granular updates. You can add or remove items with the widgets below." text_alignment: "CenterLeft" - thickness: 2 fixed_height: 34 } @@ -17,11 +16,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout fixed_height: 30 - @GUI::TextBox { name: "new_item_name" placeholder: "Enter some text to be added..." diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage1.gml b/Userland/Demos/WidgetGallery/DemoWizardPage1.gml index 047eb38fbf..644ae32d0e 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardPage1.gml +++ b/Userland/Demos/WidgetGallery/DemoWizardPage1.gml @@ -11,7 +11,6 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout @GUI::Label { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml index b58fbc0cef..0a57c38d4c 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml @@ -11,8 +11,7 @@ } @GUI::HorizontalSplitter { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Frame { name: "label_frame" @@ -49,13 +48,11 @@ } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::ComboBox { name: "frame_shape_combobox" @@ -67,8 +64,7 @@ enabled: false } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::SpinBox { name: "thickness_spinbox" @@ -89,15 +85,12 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "normal_button" @@ -110,19 +103,15 @@ enabled: "false" } - @GUI::Widget { - } + @GUI::Widget } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "enabled_coolbar_button" @@ -137,29 +126,23 @@ button_style: "Coolbar" } - @GUI::Widget { - } + @GUI::Widget } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { fixed_width: 60 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::RadioButton { name: "top_radiobutton" @@ -172,20 +155,16 @@ text: "Radio 2" } - @GUI::Widget { - } + @GUI::Widget } - @GUI::Widget { - } + @GUI::Widget @GUI::Widget { fixed_width: 70 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::CheckBox { name: "top_checkbox" @@ -198,39 +177,31 @@ enabled: false } - @GUI::Widget { - } + @GUI::Widget } - @GUI::Widget { - } + @GUI::Widget } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "icon_button" text: "Icon button" - } @GUI::Button { name: "disabled_icon_button" text: "Disabled" enabled: "false" - } - @GUI::Widget { - } + @GUI::Widget } } } @@ -242,12 +213,10 @@ @GUI::Widget { fixed_height: 47 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::TextBox { placeholder: "Text box" @@ -260,12 +229,10 @@ } } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::TextBox { text: "Read only" @@ -279,29 +246,24 @@ } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::TextEditor { name: "text_editor" placeholder: "Text editor" } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::ColorInput { name: "font_colorinput" @@ -314,8 +276,7 @@ } } - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "font_button" @@ -332,22 +293,18 @@ text: "Input dialog..." } - @GUI::Widget { - } + @GUI::Widget } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::ComboBox { name: "msgbox_icon_combobox" @@ -360,12 +317,10 @@ } } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Button { name: "msgbox_button" diff --git a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml index 6a887211f2..d5d69683ac 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml @@ -12,7 +12,6 @@ @GUI::GroupBox { max_height: 30 - layout: @GUI::HorizontalBoxLayout { margins: [8] } @@ -22,8 +21,7 @@ tooltip: "Opacity Slider" } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::ValueSlider { name: "opacity_value_slider" @@ -34,8 +32,7 @@ } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::Frame { shape: "Panel" @@ -59,8 +56,7 @@ margins: [0, 8] } - @GUI::Widget { - } + @GUI::Widget @GUI::Scrollbar { name: "enabled_scrollbar" @@ -71,14 +67,11 @@ value: 50 } - @GUI::Widget { - } + @GUI::Widget - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator - @GUI::Widget { - } + @GUI::Widget @GUI::Scrollbar { name: "disabled_scrollbar" @@ -86,8 +79,7 @@ fixed_width: -1 } - @GUI::Widget { - } + @GUI::Widget } @GUI::GroupBox { @@ -109,8 +101,7 @@ tooltip: "Fixed" } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::VerticalSlider { enabled: false @@ -120,8 +111,7 @@ value: 5 } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::VerticalProgressbar { name: "vertical_progressbar_right" @@ -144,8 +134,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::HorizontalSlider { name: "horizontal_slider_left" @@ -155,8 +144,7 @@ value: 0 } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::HorizontalSlider { enabled: false @@ -165,8 +153,7 @@ value: 5 } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::HorizontalSlider { name: "horizontal_slider_right" @@ -177,8 +164,7 @@ } } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::HorizontalProgressbar { name: "horizontal_progressbar" diff --git a/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml index 873f3c37e0..2de94a28de 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml @@ -14,8 +14,7 @@ text: "Start wizard" } - @GUI::HorizontalSeparator { - } + @GUI::HorizontalSeparator @GUI::TextEditor { name: "wizard_output" diff --git a/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml b/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml index 86984d4deb..e48f060eec 100644 --- a/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml +++ b/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml @@ -1,6 +1,5 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { spacing: 4 margins: [4, 4, 4, 4] @@ -18,8 +17,8 @@ @GUI::Widget { layout: @GUI::HorizontalBoxLayout - shrink_to_fit: true + shrink_to_fit: true @GUI::Label { name: "line_and_col_label" text: "Line: 1, Col: 0" diff --git a/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml b/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml index 5387b1d973..d2f5307654 100644 --- a/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml +++ b/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] } @@ -12,8 +11,7 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout name: "icon_view_container" } @@ -28,11 +26,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout max_height: 24 - @GUI::Label { text: "Name:" text_alignment: "CenterLeft" @@ -45,11 +41,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout max_height: 24 - @GUI::Label { text: "Create in:" text_alignment: "CenterLeft" @@ -69,11 +63,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout max_height: 24 - @GUI::Label { text: "Full path:" text_alignment: "CenterLeft" @@ -92,13 +84,10 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout max_height: 24 - - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Games/GameOfLife/GameOfLife.gml b/Userland/Games/GameOfLife/GameOfLife.gml index e1e0312d4b..fba7441b28 100644 --- a/Userland/Games/GameOfLife/GameOfLife.gml +++ b/Userland/Games/GameOfLife/GameOfLife.gml @@ -1,12 +1,9 @@ @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::ToolbarContainer { - @GUI::Toolbar { name: "toolbar" - @GUI::Label { text: "Columns: " autosize: true @@ -19,8 +16,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Label { text: "Rows: " @@ -34,8 +30,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Label { text: "Update Speed: " @@ -54,8 +49,7 @@ autosize: true } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator } } diff --git a/Userland/Games/Hearts/Hearts.gml b/Userland/Games/Hearts/Hearts.gml index ce02c66671..995337141b 100644 --- a/Userland/Games/Hearts/Hearts.gml +++ b/Userland/Games/Hearts/Hearts.gml @@ -1,8 +1,6 @@ @GUI::Widget { fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @Hearts::Game { name: "game" diff --git a/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml b/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml index 8c54f93b4e..ce37847dfb 100644 --- a/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml +++ b/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4] } @@ -8,7 +7,6 @@ @GUI::GroupBox { title: "Field" autosize: true - layout: @GUI::HorizontalBoxLayout { margins: [16, 6, 6] } @@ -25,9 +23,8 @@ fixed_width: 40 } - @GUI::VerticalSeparator { - } - + @GUI::VerticalSeparator + @GUI::Label { text: "Rows: " autosize: true @@ -40,8 +37,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator { - } + @GUI::VerticalSeparator @GUI::Label { text: "Mines: " @@ -58,12 +54,9 @@ @GUI::Widget { max_height: 24 + layout: @GUI::HorizontalBoxLayout - layout: @GUI::HorizontalBoxLayout { - } - - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Games/Solitaire/Solitaire.gml b/Userland/Games/Solitaire/Solitaire.gml index 89eab06248..55aae5f751 100644 --- a/Userland/Games/Solitaire/Solitaire.gml +++ b/Userland/Games/Solitaire/Solitaire.gml @@ -1,8 +1,6 @@ @GUI::Widget { fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @Solitaire::Game { name: "game" diff --git a/Userland/Games/Spider/Spider.gml b/Userland/Games/Spider/Spider.gml index 09e29799c2..cb15ec2f4f 100644 --- a/Userland/Games/Spider/Spider.gml +++ b/Userland/Games/Spider/Spider.gml @@ -1,8 +1,6 @@ @GUI::Widget { fill_with_background_color: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @Spider::Game { name: "game" diff --git a/Userland/Libraries/LibGUI/FilePickerDialog.gml b/Userland/Libraries/LibGUI/FilePickerDialog.gml index 87b5b7e0f1..b15307cb51 100644 --- a/Userland/Libraries/LibGUI/FilePickerDialog.gml +++ b/Userland/Libraries/LibGUI/FilePickerDialog.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::HorizontalBoxLayout { margins: [4] spacing: 3 diff --git a/Userland/Libraries/LibGUI/FontPickerDialog.gml b/Userland/Libraries/LibGUI/FontPickerDialog.gml index 8abd18c999..8f112aee2a 100644 --- a/Userland/Libraries/LibGUI/FontPickerDialog.gml +++ b/Userland/Libraries/LibGUI/FontPickerDialog.gml @@ -1,17 +1,14 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout { margins: [4, 4, 4, 4] } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { text: "Family:" @@ -26,9 +23,7 @@ @GUI::Widget { fixed_width: 100 - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { text: "Style:" @@ -43,9 +38,7 @@ @GUI::Widget { fixed_width: 80 - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { text: "Size:" @@ -64,12 +57,10 @@ } @GUI::GroupBox { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout title: "Sample text" fixed_height: 80 - @GUI::Label { name: "sample_text_label" text: "The quick brown fox jumps over the lazy dog." @@ -78,11 +69,9 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.gml b/Userland/Libraries/LibGUI/PasswordInputDialog.gml index 2c8a1d8cfd..d2c7adc998 100644 --- a/Userland/Libraries/LibGUI/PasswordInputDialog.gml +++ b/Userland/Libraries/LibGUI/PasswordInputDialog.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::HorizontalBoxLayout { margins: [8] spacing: 8 @@ -8,9 +7,7 @@ @GUI::Widget { shrink_to_fit: true - - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { name: "key_icon_label" @@ -20,14 +17,11 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { fixed_height: 24 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Server:" @@ -44,9 +38,7 @@ @GUI::Widget { fixed_height: 24 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Username:" @@ -63,9 +55,7 @@ @GUI::Widget { fixed_height: 24 - - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Password:" @@ -86,8 +76,7 @@ spacing: 6 } - @GUI::Widget { - } + @GUI::Widget @GUI::Button { text: "OK" diff --git a/Userland/Services/LoginServer/LoginWindow.gml b/Userland/Services/LoginServer/LoginWindow.gml index 76e7533bee..09b93b9c3f 100644 --- a/Userland/Services/LoginServer/LoginWindow.gml +++ b/Userland/Services/LoginServer/LoginWindow.gml @@ -1,6 +1,5 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout @GUI::ImageWidget { |