LibGUI+Applications: Use the new layout system in the settings screens

4 files changed, 24 insertions, 28 deletions

diff --git a/Userland/Applications/DisplaySettings/BackgroundSettings.gml b/Userland/Applications/DisplaySettings/BackgroundSettings.gml
index df1fbabd3b..168ad17014 100644
--- a/Userland/Applications/DisplaySettings/BackgroundSettings.gml
+++ b/Userland/Applications/DisplaySettings/BackgroundSettings.gml
@@ -28,22 +28,20 @@
 
         @GUI::IconView {
             name: "wallpaper_view"
+            preferred_width: "opportunistic_grow"
         }
 
         @GUI::Widget {
-            shrink_to_fit: true
+            preferred_width: "fit"
             layout: @GUI::VerticalBoxLayout {}
 
             @GUI::Button {
                 name: "wallpaper_open_button"
                 tooltip: "Select wallpaper from file system"
                 text: "Browse..."
-                shrink_to_fit: true
             }
 
-            @GUI::Widget {
-                fixed_height: 12
-            }
+            @GUI::Layout::Spacer {}
 
             @GUI::Label {
                 text: "Mode:"
@@ -55,9 +53,7 @@
                 name: "mode_combo"
             }
 
-            @GUI::Widget {
-                fixed_height: 12
-            }
+            @GUI::Layout::Spacer {}
 
             @GUI::Label {
                 text: "Color:"
diff --git a/Userland/Applications/DisplaySettings/FontSettings.gml b/Userland/Applications/DisplaySettings/FontSettings.gml
index 39144af16c..9470bb6a9e 100644
--- a/Userland/Applications/DisplaySettings/FontSettings.gml
+++ b/Userland/Applications/DisplaySettings/FontSettings.gml
@@ -6,7 +6,7 @@
     }
 
     @GUI::Widget {
-        shrink_to_fit: true
+        preferred_height: "fit"
         layout: @GUI::HorizontalBoxLayout {
             spacing: 6
         }
@@ -17,14 +17,13 @@
             text_alignment: "CenterLeft"
         }
 
-        @GUI::Frame {
+        @GUI::Label {
             background_role: "Base"
+            shadow: "Sunken"
+            shape: "Container"
+            thickness: 2
             fill_with_background_color: true
-            layout: @GUI::VerticalBoxLayout {}
-
-            @GUI::Label {
-                name: "default_font_label"
-            }
+            name: "default_font_label"
         }
 
         @GUI::Button {
@@ -35,7 +34,7 @@
     }
 
     @GUI::Widget {
-        shrink_to_fit: true
+        preferred_height: "fit"
         layout: @GUI::HorizontalBoxLayout {
             spacing: 6
         }
@@ -46,14 +45,13 @@
             text_alignment: "CenterLeft"
         }
 
-        @GUI::Frame {
+        @GUI::Label {
             background_role: "Base"
+            shadow: "Sunken"
+            shape: "Container"
+            thickness: 2
             fill_with_background_color: true
-            layout: @GUI::VerticalBoxLayout {}
-
-            @GUI::Label {
-                name: "fixed_width_font_label"
-            }
+            name: "fixed_width_font_label"
         }
 
         @GUI::Button {
@@ -63,5 +61,5 @@
         }
     }
 
-    @GUI::Widget {}
+    @GUI::Layout::Spacer {}
 }
diff --git a/Userland/Applications/DisplaySettings/MonitorSettings.gml b/Userland/Applications/DisplaySettings/MonitorSettings.gml
index cd39596a69..8acc169c79 100644
--- a/Userland/Applications/DisplaySettings/MonitorSettings.gml
+++ b/Userland/Applications/DisplaySettings/MonitorSettings.gml
@@ -15,7 +15,7 @@
     }
 
     @GUI::Widget {
-        shrink_to_fit: true
+        preferred_height: "fit"
         layout: @GUI::HorizontalBoxLayout {
             margins: [8, 8, 6, 16]
         }
@@ -38,7 +38,7 @@
         title: "Screen settings"
 
         @GUI::Widget {
-            shrink_to_fit: true
+            preferred_height: "fit"
             layout: @GUI::HorizontalBoxLayout {}
 
             @GUI::Label {
@@ -64,7 +64,7 @@
         }
 
         @GUI::Widget {
-            shrink_to_fit: true
+            preferred_height: "fit"
             layout: @GUI::HorizontalBoxLayout {}
 
             @GUI::Label {
@@ -84,6 +84,8 @@
                 text: "2x"
                 fixed_width: 50
             }
+
+            @GUI::Layout::Spacer {}
         }
     }
 }
diff --git a/Userland/Applications/DisplaySettings/ThemesSettings.gml b/Userland/Applications/DisplaySettings/ThemesSettings.gml
index 28b2aaa16c..56ed183fc4 100644
--- a/Userland/Applications/DisplaySettings/ThemesSettings.gml
+++ b/Userland/Applications/DisplaySettings/ThemesSettings.gml
@@ -23,13 +23,13 @@
         }
 
         @GUI::Widget {
-            shrink_to_fit: true
+            preferred_height: "fit"
             layout: @GUI::HorizontalBoxLayout {}
 
             @GUI::Label {
                 text: "Theme:"
                 text_alignment: "CenterLeft"
-                fixed_width: 95
+                preferred_width: 95
             }
 
             @GUI::ComboBox {