[gnome-control-center/gbsneto/display-panel-redesign: 3/17] display: Move config type toggles into a row

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit 62bf8aee38fc9ec2e0b65147df4a07a9c62abc5c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Jan 6 13:29:12 2022 -0300

    display: Move config type toggles into a row
    
    Fortunately for us, AdwPreferencesGroup makes that trivial.
    Move the linked box into an AdwActionRow, and remove the icon
    and the margins from the toggle buttons.

 panels/display/cc-display-panel.ui | 104 +++++++++----------------------------
 1 file changed, 24 insertions(+), 80 deletions(-)
---
diff --git a/panels/display/cc-display-panel.ui b/panels/display/cc-display-panel.ui
index 56911aec7..2bcceb235 100644
--- a/panels/display/cc-display-panel.ui
+++ b/panels/display/cc-display-panel.ui
@@ -47,95 +47,39 @@
                             <property name="spacing">32</property>
                             <child>
                               <object class="AdwPreferencesGroup" id="config_type_switcher_group">
+
+                                <!-- Config Type -->
                                 <child>
-                                  <object class="GtkBox">
-                                    <property name="homogeneous">True</property>
-                                    <style>
-                                      <class name="linked" />
-                                    </style>
-                                    <child>
-                                      <object class="GtkToggleButton" id="config_type_join">
-                                        <property name="hexpand">True</property>
-                                        <property name="active">True</property>
-                                        <signal name="toggled" handler="on_config_type_toggled_cb" 
swapped="yes"/>
+                                  <object class="AdwActionRow" id="config_type_switcher_row">
+                                    <property name="title" translatable="yes">Multiple Displays</property>
+                                    <child type="suffix">
+                                      <object class="GtkBox">
+                                        <property name="valign">center</property>
+                                        <style>
+                                          <class name="linked" />
+                                        </style>
                                         <child>
-                                          <object class="GtkBox">
-                                            <property name="halign">center</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkImage">
-                                                <property name="margin_start">12</property>
-                                                <property name="margin_end">12</property>
-                                                <property name="margin_top">12</property>
-                                                <property name="margin_bottom">12</property>
-                                                <property 
name="icon_name">video-joined-displays-symbolic</property>
-                                                <property name="icon_size">large</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Join 
Displays</property>
-                                              </object>
-                                            </child>
+                                          <object class="GtkToggleButton" id="config_type_join">
+                                            <property name="label" translatable="yes" comments="'Join' as in 
'Join displays'">Join</property>
+                                            <property name="active">True</property>
+                                            <signal name="toggled" handler="on_config_type_toggled_cb" 
swapped="yes"/>
                                           </object>
                                         </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleButton" id="config_type_mirror">
-                                        <property name="hexpand">True</property>
-                                        <property name="group">config_type_join</property>
-                                        <signal name="toggled" handler="on_config_type_toggled_cb" 
swapped="yes"/>
                                         <child>
-                                          <object class="GtkBox">
-                                            <property name="halign">center</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkImage">
-                                                <property name="margin_start">12</property>
-                                                <property name="margin_end">12</property>
-                                                <property name="margin_top">12</property>
-                                                <property name="margin_bottom">12</property>
-                                                <property name="icon_name">view-mirror-symbolic</property>
-                                                <property name="icon_size">large</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Mirror</property>
-                                              </object>
-                                            </child>
+                                          <object class="GtkToggleButton" id="config_type_mirror">
+                                            <property name="label" translatable="yes">Mirror</property>
+                                            <property name="group">config_type_join</property>
+                                            <signal name="toggled" handler="on_config_type_toggled_cb" 
swapped="yes"/>
                                           </object>
                                         </child>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleButton" id="config_type_single">
-                                        <property name="hexpand">True</property>
-                                        <property name="group">config_type_join</property>
-                                        <signal name="toggled" handler="on_config_type_toggled_cb" 
swapped="yes"/>
                                         <child>
-                                          <object class="GtkBox">
-                                            <property name="halign">center</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkImage">
-                                                <property name="margin_start">12</property>
-                                                <property name="margin_end">12</property>
-                                                <property name="margin_top">12</property>
-                                                <property name="margin_bottom">12</property>
-                                                <property 
name="icon_name">video-single-display-symbolic</property>
-                                                <property name="icon_size">large</property>
-                                              </object>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel">
-                                                <property name="label" translatable="yes">Single 
Display</property>
-                                              </object>
-                                            </child>
-                                          </object>
+                                          <object class="GtkToggleButton" id="config_type_single">
+                                            <property name="label" translatable="yes" comments="'Single' as 
in 'Single display'">Single</property>
+                                            <property name="group">config_type_join</property>
+                                            <signal name="toggled" handler="on_config_type_toggled_cb" 
swapped="yes"/>
+                                         </object>
                                         </child>
-                                     </object>
+                                      </object>
                                     </child>
                                   </object>
                                 </child>