From 535d97ddc82bc7ce21ed7c6ac4d3468931fa4007 Mon Sep 17 00:00:00 2001
From: Danielle Fore <danielle@elementary.io>
Date: Wed, 24 Jan 2024 14:45:50 -0800
Subject: [PATCH] AbstractSettingsPage: Subclass Gtk.Widget

---
 lib/AbstractSettingsPage.vala       | 20 +---------------
 lib/AbstractSimpleSettingsPage.vala | 36 +++++++++++++++++++++++------
 lib/meson.build                     |  1 +
 3 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/lib/AbstractSettingsPage.vala b/lib/AbstractSettingsPage.vala
index 6fd1b852..380cacc4 100644
--- a/lib/AbstractSettingsPage.vala
+++ b/lib/AbstractSettingsPage.vala
@@ -7,10 +7,9 @@
  * AbstractSettingsPage is a {@link Gtk.ScrolledWindow} subclass with properties used
  * by other Granite settings widgets.
  */
-public abstract class Switchboard.SettingsPage : Gtk.Box {
+public abstract class Switchboard.SettingsPage : Gtk.Widget {
     protected string _icon_name;
     protected string _title;
-    private Gtk.ScrolledWindow scrolled;
 
     /**
      * Used to display a status icon overlayed on the display_widget in a Granite.SettingsSidebar
@@ -66,21 +65,4 @@ public abstract class Switchboard.SettingsPage : Gtk.Box {
             _title = value;
         }
     }
-
-    public new Gtk.Widget child {
-        get {
-            return scrolled.child;
-        }
-        set {
-            scrolled.child = value;
-        }
-    }
-
-    construct {
-        scrolled = new Gtk.ScrolledWindow () {
-            hscrollbar_policy = Gtk.PolicyType.NEVER
-        };
-
-        append (scrolled);
-    }
 }
diff --git a/lib/AbstractSimpleSettingsPage.vala b/lib/AbstractSimpleSettingsPage.vala
index 053c813b..d671dd78 100644
--- a/lib/AbstractSimpleSettingsPage.vala
+++ b/lib/AbstractSimpleSettingsPage.vala
@@ -11,6 +11,7 @@
 public abstract class Switchboard.SimpleSettingsPage : Switchboard.SettingsPage {
     private Gtk.Label description_label;
     private string _description;
+    private Adw.Clamp content_area;
 
     /**
      * A {@link Gtk.Box} used as the action area for #this
@@ -18,9 +19,16 @@ public abstract class Switchboard.SimpleSettingsPage : Switchboard.SettingsPage
     public Gtk.Box action_area { get; construct; }
 
     /**
-     * A {@link Gtk.Grid} used as the content area for #this
+     * The child widget for the content area
      */
-    public Gtk.Grid content_area { get; construct; }
+    public Gtk.Widget child {
+        get {
+            return content_area.child;
+        }
+        set {
+            content_area.child = value;
+        }
+    }
 
     /**
      * A {@link Gtk.Switch} that appears in the header area when #this.activatable is #true. #status_switch will be #null when #this.activatable is #false
@@ -55,6 +63,10 @@ public abstract class Switchboard.SimpleSettingsPage : Switchboard.SettingsPage
 
     }
 
+    static construct {
+        set_layout_manager_type (typeof (Gtk.BinLayout));
+    }
+
     class construct {
         set_css_name ("simplesettingspage");
     }
@@ -98,9 +110,11 @@ public abstract class Switchboard.SimpleSettingsPage : Switchboard.SettingsPage
             header_area.attach (status_switch, 2, 0);
         }
 
-        content_area = new Gtk.Grid () {
-            column_spacing = 12,
-            row_spacing = 12,
+        var header_clamp = new Adw.Clamp () {
+            child = header_area
+        };
+
+        content_area = new Adw.Clamp () {
             vexpand = true
         };
         content_area.add_css_class ("content-area");
@@ -111,11 +125,15 @@ public abstract class Switchboard.SimpleSettingsPage : Switchboard.SettingsPage
         action_area.add_css_class ("buttonbox");
 
         var grid = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        grid.append (header_area);
+        grid.append (header_clamp);
         grid.append (content_area);
         grid.append (action_area);
 
-        child = grid;
+        var scrolled = new Gtk.ScrolledWindow () {
+            child = grid,
+            hscrollbar_policy = NEVER
+        };
+        scrolled.set_parent (this);
 
         notify["icon-name"].connect (() => {
             if (header_icon != null) {
@@ -129,4 +147,8 @@ public abstract class Switchboard.SimpleSettingsPage : Switchboard.SettingsPage
             }
         });
     }
+
+    ~SimpleSettingsPage () {
+        get_first_child ().unparent ();
+    }
 }
diff --git a/lib/meson.build b/lib/meson.build
index 6ce8ab2f..220c5408 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -9,6 +9,7 @@ config_header = configure_file(
 )
 
 libswitchboard_deps = [
+    adwaita_dep,
     glib_dep,
     gio_dep,
     gio_unix_dep,