From 216a7619b7822e62ca1be1d2d0e51c4b79fddf1c Mon Sep 17 00:00:00 2001
From: Emad Saadat <professional@saadat.xyz>
Date: Mon, 27 Mar 2023 22:09:53 -0700
Subject: wi-fi: Have page contents clamped like other pages Achieved by making
 the container widget for all other widgets in the content section of the
 panel an AdwPreferencesPage and having each group of widgets (e.g. the
 airplane mode toggle and the stack that shows the list of wi-fi networks or a
 status message) be in its own AdwPreferencesGroup.

Much along the lines of !1739 and !1740

Also fixes #2420
---
 panels/network/cc-wifi-panel.ui | 293 +++++++++++++++++++---------------------
 1 file changed, 141 insertions(+), 152 deletions(-)

diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
index 722ca3d45..b57924407 100644
--- a/panels/network/cc-wifi-panel.ui
+++ b/panels/network/cc-wifi-panel.ui
@@ -47,191 +47,180 @@
     </child>
 
     <child type="content">
-      <object class="GtkScrolledWindow">
-        <property name="hscrollbar-policy">never</property>
+      <object class="AdwPreferencesPage">
+        <!-- Airplane Mode Toggle -->
         <child>
-          <object class="AdwClamp">
-            <property name="margin_top">32</property>
-            <property name="margin_bottom">32</property>
-            <property name="margin_start">12</property>
-            <property name="margin_end">12</property>
+          <object class="AdwPreferencesGroup">
+            <child>
+              <object class="GtkListBox" id="rfkill_widget">
+                <property name="margin_bottom">32</property>
+                <property name="selection-mode">none</property>
+                <style>
+                  <class name="boxed-list"/>
+                </style>
+                <child>
+                  <object class="CcListRow" id="rfkill_row">
+                    <property name="show-switch">True</property>
+                    <property name="title" translatable="yes">Airplane Mode</property>
+                    <property name="subtitle" translatable="yes">Disables Wi-Fi, Bluetooth and mobile broadband</property>
+                    <signal name="notify::active" handler="rfkill_switch_notify_activate_cb" object="CcWifiPanel" swapped="no" />
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
 
+        <!-- Wi-Fi List / No Wi-Fi Adapter / Airplane Mode Enabled -->
+        <child>
+          <object class="AdwPreferencesGroup">
             <child>
-              <object class="GtkBox">
-                <property name="hexpand">True</property>
-                <property name="orientation">vertical</property>
+              <object class="GtkStack" id="main_stack">
+                <property name="hhomogeneous">False</property>
+                <property name="vhomogeneous">False</property>
+                <property name="transition_type">crossfade</property>
 
-                <!-- Airplane Mode -->
+                <!-- "No Wi-Fi Adapter" page -->
                 <child>
-                  <object class="GtkListBox" id="rfkill_widget">
-                    <property name="margin_bottom">32</property>
-                    <property name="selection-mode">none</property>
-                    <style>
-                      <class name="boxed-list"/>
-                    </style>
-                    <child>
-                      <object class="CcListRow" id="rfkill_row">
-                        <property name="show-switch">True</property>
-                        <property name="title" translatable="yes">Airplane Mode</property>
-                        <property name="subtitle" translatable="yes">Disables Wi-Fi, Bluetooth and mobile broadband</property>
-                        <signal name="notify::active" handler="rfkill_switch_notify_activate_cb" object="CcWifiPanel" swapped="no" />
-                      </object>
-                    </child>
+                  <object class="GtkStackPage">
+                    <property name="name">no-wifi-devices</property>
+                    <property name="child">
+                      <object class="AdwStatusPage">
+                        <property name="icon-name">network-wireless-no-route-symbolic</property>
+                        <property name="title" translatable="yes">No Wi-Fi Adapter Found</property>
+                        <property name="description" translatable="yes">Make sure you have a Wi-Fi adapter plugged and turned on</property>
+                     </object>
+                    </property>
                   </object>
                 </child>
 
+                <!-- "Airplane Mode" page -->
                 <child>
-                  <object class="GtkStack" id="main_stack">
-                    <property name="hhomogeneous">False</property>
-                    <property name="vhomogeneous">False</property>
-                    <property name="transition_type">crossfade</property>
-
-                    <!-- "No Wi-Fi Adapter" page -->
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">no-wifi-devices</property>
-                        <property name="child">
-                          <object class="AdwStatusPage">
-                            <property name="icon-name">network-wireless-no-route-symbolic</property>
-                            <property name="title" translatable="yes">No Wi-Fi Adapter Found</property>
-                            <property name="description" translatable="yes">Make sure you have a Wi-Fi adapter plugged and turned on</property>
-                         </object>
-                        </property>
+                  <object class="GtkStackPage">
+                    <property name="name">airplane-mode</property>
+                    <property name="child">
+                      <object class="AdwStatusPage">
+                        <property name="icon-name">airplane-mode-symbolic</property>
+                        <property name="title" translatable="yes">Airplane Mode On</property>
+                        <property name="description" translatable="yes">Turn off to use Wi-Fi</property>
                       </object>
-                    </child>
-
-                    <!-- "Airplane Mode" page -->
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">airplane-mode</property>
-                        <property name="child">
-                          <object class="AdwStatusPage">
-                            <property name="icon-name">airplane-mode-symbolic</property>
-                            <property name="title" translatable="yes">Airplane Mode On</property>
-                            <property name="description" translatable="yes">Turn off to use Wi-Fi</property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
+                    </property>
+                  </object>
+                </child>
 
-                    <!-- Wi-Fi connections and devices -->
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">wifi-connections</property>
-                        <property name="child">
-                          <object class="GtkBox">
+                <!-- Wi-Fi connections and devices -->
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">wifi-connections</property>
+                    <property name="child">
+                      <object class="GtkBox">
+                        <property name="orientation">vertical</property>
+
+                        <child>
+                          <object class="GtkBox" id="hotspot_box">
                             <property name="orientation">vertical</property>
 
+                            <!-- Hotspot QR code -->
                             <child>
-                              <object class="GtkBox" id="hotspot_box">
-                                <property name="orientation">vertical</property>
-
-                                <!-- Hotspot QR code -->
-                                <child>
-                                  <object class="GtkPicture" id="wifi_qr_image">
-                                    <property name="halign">center</property>
-                                    <property name="valign">center</property>
-                                    <property name="width-request">180</property>
-                                    <property name="height-request">180</property>
-                                    <style>
-                                      <class name="frame"/>
-                                      <class name="qr-image"/>
-                                    </style>
-                                  </object>
-                                </child>
-
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="margin-top">12</property>
-                                    <property name="label" translatable="yes">Wi-Fi Hotspot Active</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold" />
-                                      <attribute name="scale" value="1.8" />
-                                    </attributes>
-                                  </object>
-                                </child>
-
-                                <child>
-                                  <object class="GtkLabel">
-                                    <property name="label" translatable="yes">Mobile devices can scan the QR code to connect.</property>
-                                  </object>
-                                </child>
-
-                                <child>
-                                  <object class="GtkButton">
-                                    <property name="halign">center</property>
-                                    <property name="margin-top">12</property>
-                                    <property name="label" translatable="yes">Turn Off Hotspot…</property>
-                                    <signal name="clicked" handler="hotspot_stop_clicked_cb" swapped="yes"/>
-                                    <style>
-                                      <class name="destructive-action"/>
-                                    </style>
-                                  </object>
-                                </child>
+                              <object class="GtkPicture" id="wifi_qr_image">
+                                <property name="halign">center</property>
+                                <property name="valign">center</property>
+                                <property name="width-request">180</property>
+                                <property name="height-request">180</property>
+                                <style>
+                                  <class name="frame"/>
+                                  <class name="qr-image"/>
+                                </style>
+                              </object>
+                            </child>
 
+                            <child>
+                              <object class="GtkLabel">
+                                <property name="margin-top">12</property>
+                                <property name="label" translatable="yes">Wi-Fi Hotspot Active</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold" />
+                                  <attribute name="scale" value="1.8" />
+                                </attributes>
                               </object>
                             </child>
 
-                            <!-- Visible Networks label & spinner -->
                             <child>
-                              <object class="GtkBox">
-                                <property name="hexpand">True</property>
-                                <property name="halign">start</property>
-                                <property name="spacing">6</property>
-                                <property name="margin_bottom">12</property>
-                                <child>
-                                  <object class="GtkLabel" id="list_label">
-                                    <property name="label" translatable="yes">Visible Networks</property>
-                                    <property name="xalign">0.0</property>
-                                    <attributes>
-                                      <attribute name="weight" value="bold"/>
-                                    </attributes>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkSpinner" id="spinner">
-                                    <property name="hexpand">True</property>
-                                  </object>
-                                </child>
+                              <object class="GtkLabel">
+                                <property name="label" translatable="yes">Mobile devices can scan the QR code to connect.</property>
                               </object>
                             </child>
 
-                            <!-- Stack with a listbox for each Wi-Fi device -->
                             <child>
-                              <object class="GtkStack" id="stack">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="transition_type">crossfade</property>
-                                <signal name="notify::visible-child-name" handler="on_stack_visible_child_changed_cb" object="CcWifiPanel" swapped="no" />
+                              <object class="GtkButton">
+                                <property name="halign">center</property>
+                                <property name="margin-top">12</property>
+                                <property name="label" translatable="yes">Turn Off Hotspot…</property>
+                                <signal name="clicked" handler="hotspot_stop_clicked_cb" swapped="yes"/>
+                                <style>
+                                  <class name="destructive-action"/>
+                                </style>
                               </object>
                             </child>
 
                           </object>
-                        </property>
-                      </object>
-                    </child>
-
-                    <!-- "NetworkManager Not Running" page -->
-                    <child>
-                      <object class="GtkStackPage">
-                        <property name="name">nm-not-running</property>
-                        <property name="child">
-                          <object class="AdwStatusPage">
-                            <property name="icon-name">network-wireless-disabled</property>
-                            <property name="title" translatable="yes">Wi-Fi Unavailable</property>
-                            <property name="description" translatable="yes">An error has occurred and Wi-Fi cannot be used.
-Error details: NetworkManager not running.</property>
-                           </object>
-                        </property>
-                      </object>
-                    </child>
+                        </child>
+
+                        <!-- Visible Networks label & spinner -->
+                        <child>
+                          <object class="GtkBox">
+                            <property name="hexpand">True</property>
+                            <property name="halign">start</property>
+                            <property name="spacing">6</property>
+                            <property name="margin_bottom">12</property>
+                            <child>
+                              <object class="GtkLabel" id="list_label">
+                                <property name="label" translatable="yes">Visible Networks</property>
+                                <property name="xalign">0.0</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                </attributes>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkSpinner" id="spinner">
+                                <property name="hexpand">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+
+                        <!-- Stack with a listbox for each Wi-Fi device -->
+                        <child>
+                          <object class="GtkStack" id="stack">
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="transition_type">crossfade</property>
+                            <signal name="notify::visible-child-name" handler="on_stack_visible_child_changed_cb" object="CcWifiPanel" swapped="no" />
+                          </object>
+                        </child>
 
+                      </object>
+                    </property>
                   </object>
                 </child>
 
+                <!-- "NetworkManager Not Running" page -->
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">nm-not-running</property>
+                    <property name="child">
+                      <object class="AdwStatusPage">
+                        <property name="icon-name">network-wireless-disabled</property>
+                        <property name="title" translatable="yes">Wi-Fi Unavailable</property>
+                        <property name="description" translatable="yes">An error has occurred and Wi-Fi cannot be used.
+Error details: NetworkManager not running.</property>
+                       </object>
+                    </property>
+                  </object>
+                </child>
               </object>
             </child>
-
           </object>
         </child>
       </object>
-- 
cgit v1.2.1