diff --git a/Userland/Applications/Calculator/CalculatorWindow.gml b/Userland/Applications/Calculator/CalculatorWindow.gml index a311e0cb92..ef5a4051e3 100644 --- a/Userland/Applications/Calculator/CalculatorWindow.gml +++ b/Userland/Applications/Calculator/CalculatorWindow.gml @@ -12,8 +12,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { name: "label" @@ -51,8 +50,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Button { name: "mem_clear_button" @@ -107,7 +105,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout {} + layout: @GUI::HorizontalBoxLayout @GUI::Button { name: "mem_recall_button" @@ -162,7 +160,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout {} + layout: @GUI::HorizontalBoxLayout @GUI::Button { name: "mem_save_button" @@ -217,7 +215,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout {} + layout: @GUI::HorizontalBoxLayout @GUI::Button { name: "mem_add_button" diff --git a/Userland/Applications/CrashReporter/CrashReporterWindow.gml b/Userland/Applications/CrashReporter/CrashReporterWindow.gml index b8da3b014a..2e6a8abfa2 100644 --- a/Userland/Applications/CrashReporter/CrashReporterWindow.gml +++ b/Userland/Applications/CrashReporter/CrashReporterWindow.gml @@ -25,8 +25,7 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Executable path:" @@ -43,8 +42,7 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Coredump path:" @@ -61,8 +59,7 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Arguments:" @@ -83,12 +80,10 @@ @GUI::Widget { fixed_height: 32 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout // HACK: We need something like Layout::add_spacer() in GML! :^) - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "close_button" diff --git a/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml b/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml index 3cd1407522..26770c7ad0 100644 --- a/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml +++ b/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml @@ -13,8 +13,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Wallpaper:" @@ -37,8 +36,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Modes:" @@ -53,8 +51,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Resolution:" @@ -67,8 +64,7 @@ fixed_width: 90 } - @GUI::Widget { - } + @GUI::Widget @GUI::Label { text: "Display scale:" @@ -89,8 +85,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Color:" @@ -104,16 +99,13 @@ } } - @GUI::Widget { - } + @GUI::Widget @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/Run/Run.gml b/Userland/Applications/Run/Run.gml index 650dfe570e..d5bf77096b 100644 --- a/Userland/Applications/Run/Run.gml +++ b/Userland/Applications/Run/Run.gml @@ -22,8 +22,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Open:" @@ -37,12 +36,10 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout // HACK: using an empty widget as a spacer - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/Serendipity/SerendipityWindow.gml b/Userland/Applications/Serendipity/SerendipityWindow.gml index b4e027242a..249fa08791 100644 --- a/Userland/Applications/Serendipity/SerendipityWindow.gml +++ b/Userland/Applications/Serendipity/SerendipityWindow.gml @@ -15,14 +15,12 @@ fixed_width: 251 } - @GUI::Widget { - } + @GUI::Widget } @GUI::Widget { min_height: 160 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Frame { name: "tip_frame" @@ -34,21 +32,18 @@ @GUI::Widget { fixed_width: 60 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { name: "light_bulb_label" fixed_height: 60 } - @GUI::Widget { - } + @GUI::Widget } @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Label { fixed_height: 60 @@ -80,8 +75,7 @@ name: "navigation_column" fixed_width: 115 min_height: 160 - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Button { name: "new_button" @@ -98,8 +92,7 @@ text: "Next Tip" } - @GUI::Widget { - } + @GUI::Widget @GUI::HorizontalSeparator { fixed_height: 2 @@ -122,8 +115,7 @@ fixed_width: 315 } - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "close_button" diff --git a/Userland/Applications/Spreadsheet/CondFormatting.gml b/Userland/Applications/Spreadsheet/CondFormatting.gml index 437b5a1c3d..79617f2894 100644 --- a/Userland/Applications/Spreadsheet/CondFormatting.gml +++ b/Userland/Applications/Spreadsheet/CondFormatting.gml @@ -18,8 +18,7 @@ spacing: 10 } - @GUI::Widget { - } + @GUI::Widget @GUI::Button { name: "add_button" @@ -33,8 +32,6 @@ fixed_width: 70 } - @GUI::Widget { - } - + @GUI::Widget } } diff --git a/Userland/Applications/Spreadsheet/CondView.gml b/Userland/Applications/Spreadsheet/CondView.gml index d2161da89f..c896c4865b 100644 --- a/Userland/Applications/Spreadsheet/CondView.gml +++ b/Userland/Applications/Spreadsheet/CondView.gml @@ -1,12 +1,10 @@ @GUI::Widget { - layout: @GUI::VerticalBoxLayout { - } + layout: @GUI::VerticalBoxLayout @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "if..." @@ -23,8 +21,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Foreground..." @@ -39,8 +36,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Background..." diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage1.gml b/Userland/Demos/WidgetGallery/DemoWizardPage1.gml index 7840a4c92e..136ff9296c 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardPage1.gml +++ b/Userland/Demos/WidgetGallery/DemoWizardPage1.gml @@ -12,8 +12,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout { - } + layout: @GUI::HorizontalBoxLayout @GUI::Label { text: "Location: " @@ -31,7 +30,5 @@ } // Spacer - @GUI::Widget { - - } + @GUI::Widget } diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml index 1fd31f416d..47da912052 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml +++ b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml @@ -15,7 +15,5 @@ } // Spacer - @GUI::Widget { - - } + @GUI::Widget }