From fe785d357d4ce0563625a78db17728338eabd97c Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sat, 16 Jul 2022 09:54:37 -0300
Subject: [PATCH] user-controls: Remove AdwPreferencesPage

AdwPreferencesPage is intended to be used as the first widget
inside page. It has an AdwClamp and a scrolled window to handle
just that.

Putting it in the MctUserControls widget is undesired, because
it introduces an oddly positioned scrolled window in the parental
controls page of Initial Setup, and if we ever reintroduce this
widgetry in Settings, it would suffer from the same problem.

Remove AdwPreferencesPage from MctUserControls, and replace it
with a vertical box. Add an AdwPreferencesPage in malcontent-controls
to compensate for that.
---
 libmalcontent-ui/user-controls.ui |  4 +++-
 malcontent-control/main.ui        | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/libmalcontent-ui/user-controls.ui b/libmalcontent-ui/user-controls.ui
index 5c0dbb4..bfd3e45 100644
--- a/libmalcontent-ui/user-controls.ui
+++ b/libmalcontent-ui/user-controls.ui
@@ -4,7 +4,9 @@
   <requires lib="gtk+" version="3.12"/>
   <template class="MctUserControls" parent="AdwBin">
     <child>
-      <object class="AdwPreferencesPage">
+      <object class="GtkBox">
+        <property name="spacing">24</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="AdwPreferencesGroup">
             <child>
diff --git a/malcontent-control/main.ui b/malcontent-control/main.ui
index 81ffa8d..1691dee 100644
--- a/malcontent-control/main.ui
+++ b/malcontent-control/main.ui
@@ -58,12 +58,20 @@
                       </object>
                     </child>
                     <child>
-                      <object class="MctUserControls" id="user_controls">
-                        <!-- Content is set in code; this string is just a placeholder -->
-                        <property name="description">It’s recommended that restrictions are set as part of an ongoing conversation with $name. Read guidance on what to consider.</property>
-                        <property name="height-request">270</property>
-                        <property name="dbus-connection">dbus_connection</property>
-                        <property name="vexpand">True</property>
+                      <object class="AdwPreferencesPage">
+                        <child>
+                          <object class="AdwPreferencesGroup">
+                            <child>
+                              <object class="MctUserControls" id="user_controls">
+                                <!-- Content is set in code; this string is just a placeholder -->
+                                <property name="description">It’s recommended that restrictions are set as part of an ongoing conversation with $name. Read guidance on what to consider.</property>
+                                <property name="height-request">270</property>
+                                <property name="dbus-connection">dbus_connection</property>
+                                <property name="vexpand">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>