cc-ua-panel: Use AdwActionRow for all rows

AdwActionRow simplifies activation handling for
switches, provides consistent styling and sizing,
and mnemonic handling.

2 files changed, 126 insertions, 476 deletions

diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c
index 6518189aa..384f6945c 100644
--- a/panels/universal-access/cc-ua-panel.c
+++ b/panels/universal-access/cc-ua-panel.c
@@ -120,17 +120,13 @@ struct _CcUaPanel
   GtkSwitch         *enable_animations_switch;
   GtkListBox        *hearing_listbox;
   GtkSwitch         *highcontrast_enable_switch;
-  GtkListBoxRow     *highcontrast_row;
   GtkSwitch         *large_text_enable_switch;
-  GtkListBoxRow     *large_text_row;
   GtkSwitch         *locate_pointer_enable_switch;
   GtkSwitch         *mouse_keys_enable_switch;
-  GtkListBoxRow     *mouse_keys_row;
   GtkListBox        *pointing_listbox;
   GtkLabel          *repeat_keys_label;
   GtkListBoxRow     *repeat_keys_row;
   GtkSwitch         *screen_keyboard_enable_switch;
-  GtkListBoxRow     *screen_keyboard_row;
   GtkLabel          *screen_reader_label;
   GtkListBoxRow     *screen_reader_row;
   GtkListBox        *seeing_listbox;
@@ -205,17 +201,13 @@ cc_ua_panel_class_init (CcUaPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, enable_animations_switch);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, hearing_listbox);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, highcontrast_enable_switch);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, highcontrast_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, large_text_enable_switch);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, large_text_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, locate_pointer_enable_switch);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, mouse_keys_enable_switch);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, mouse_keys_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, pointing_listbox);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, repeat_keys_label);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, repeat_keys_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_keyboard_enable_switch);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_keyboard_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_reader_label);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_reader_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, seeing_listbox);
@@ -366,15 +358,6 @@ cc_ua_panel_init_status (CcUaPanel *self)
 }
 
 static void
-toggle_switch (GtkSwitch *sw)
-{
-  gboolean active;
-
-  active = gtk_switch_get_active (sw);
-  gtk_switch_set_active (sw, !active);
-}
-
-static void
 run_dialog (CcUaPanel *self, GtkDialog *dialog)
 {
   GtkNative *native = gtk_widget_get_native (GTK_WIDGET (self));
@@ -386,23 +369,7 @@ run_dialog (CcUaPanel *self, GtkDialog *dialog)
 static void
 activate_row (CcUaPanel *self, GtkListBoxRow *row)
 {
-  if (row == self->highcontrast_row)
-    {
-      toggle_switch (self->highcontrast_enable_switch);
-    }
-  else if (row == self->large_text_row)
-    {
-      toggle_switch (self->large_text_enable_switch);
-    }
-  else if (row == self->screen_keyboard_row)
-    {
-      toggle_switch (self->screen_keyboard_enable_switch);
-    }
-  else if (row == self->mouse_keys_row)
-    {
-      toggle_switch (self->mouse_keys_enable_switch);
-    }
-  else if (row == self->zoom_row)
+  if (row == self->zoom_row)
     {
       run_dialog (self, GTK_DIALOG (cc_zoom_options_dialog_new ()));
     }
diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui
index 5b84ef0aa..2080f343b 100644
--- a/panels/universal-access/cc-ua-panel.ui
+++ b/panels/universal-access/cc-ua-panel.ui
@@ -55,222 +55,89 @@
                       <relation name="labelled-by">seeing_heading_label</relation>
                     </accessibility>
                     <child>
-                      <object class="GtkListBoxRow" id="highcontrast_row">
-                        <property name="selectable">False</property>
-                        <property name="activatable">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">6</property>
-                                <property name="margin_bottom">6</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_High Contrast</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">highcontrast_enable_switch</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="highcontrast_enable_switch">
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="highcontrast_row">
+                        <property name="title" translatable="yes">_High Contrast</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable-widget">highcontrast_enable_switch</property>
+                        <child type="suffix">
+                          <object class="GtkSwitch" id="highcontrast_enable_switch">
+                            <property name="valign">center</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="large_text_row">
-                        <property name="selectable">False</property>
-                        <property name="activatable">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Large Text</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">large_text_enable_switch</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="large_text_enable_switch">
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow">
+                        <property name="title" translatable="yes">_Large Text</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable-widget">large_text_enable_switch</property>
+                        <child type="suffix">
+                          <object class="GtkSwitch" id="large_text_enable_switch">
+                            <property name="valign">center</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="enable_animations_row">
-                        <property name="selectable">False</property>
-                        <property name="activatable">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="hexpand">True</property>
-                                <property name="label" translatable="yes">Enable A_nimations</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">enable_animations_switch</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="enable_animations_switch">
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow">
+                        <property name="title" translatable="yes">Enable A_nimations</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable-widget">enable_animations_switch</property>
+                        <child type="suffix">
+                          <object class="GtkSwitch" id="enable_animations_switch">
+                            <property name="valign">center</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="cursor_size_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="label" translatable="yes">C_ursor Size</property>
-                                <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="cursor_size_label">
-                                <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="label">24 pixels</property>
-                                <property name="xalign">1</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="cursor_size_row">
+                        <property name="title" translatable="yes">C_ursor Size</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="cursor_size_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="zoom_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Zoom</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="zoom_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="zoom_row">
+                        <property name="title" translatable="yes">_Zoom</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="zoom_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="screen_reader_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">Screen _Reader</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="screen_reader_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="screen_reader_row">
+                        <property name="title" translatable="yes">Screen _Reader</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="screen_reader_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="sound_keys_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Sound Keys</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="sound_keys_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="sound_keys_row">
+                        <property name="title" translatable="yes">_Sound Keys</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="sound_keys_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
@@ -307,32 +174,14 @@
                       <relation name="labelled-by">hearing_heading_label</relation>
                     </accessibility>
                     <child>
-                      <object class="GtkListBoxRow" id="visual_alerts_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Visual Alerts</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="visual_alerts_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="visual_alerts_row">
+                        <property name="title" translatable="yes">_Visual Alerts</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="visual_alerts_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
@@ -369,126 +218,52 @@
                       <relation name="labelled-by">typing_heading_label</relation>
                     </accessibility>
                     <child>
-                      <object class="GtkListBoxRow" id="screen_keyboard_row">
-                        <property name="selectable">False</property>
-                        <property name="activatable">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">Screen _Keyboard</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">screen_keyboard_enable_switch</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="screen_keyboard_enable_switch">
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow">
+                        <property name="title" translatable="yes">Screen _Keyboard</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable-widget">screen_keyboard_enable_switch</property>
+                        <child type="suffix">
+                          <object class="GtkSwitch" id="screen_keyboard_enable_switch">
+                            <property name="valign">center</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="repeat_keys_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">R_epeat Keys</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="repeat_keys_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="repeat_keys_row">
+                        <property name="title" translatable="yes">R_epeat Keys</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="repeat_keys_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="cursor_blinking_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">Cursor _Blinking</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="cursor_blinking_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="cursor_blinking_row">
+                        <property name="title" translatable="yes">Cursor _Blinking</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="cursor_blinking_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="accessx_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Typing Assist (AccessX)</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="accessx_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="accessx_row">
+                        <property name="title" translatable="yes">_Typing Assist (AccessX)</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="accessx_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
@@ -525,131 +300,55 @@
                       <relation name="labelled-by">pointing_heading_label</relation>
                     </accessibility>
                     <child>
-                      <object class="GtkListBoxRow" id="mouse_keys_row">
-                        <property name="selectable">False</property>
-                        <property name="activatable">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Mouse Keys</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">mouse_keys_enable_switch</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="mouse_keys_enable_switch">
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow">
+                        <property name="title" translatable="yes">_Mouse Keys</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable-widget">mouse_keys_enable_switch</property>
+                        <child type="suffix">
+                          <object class="GtkSwitch" id="mouse_keys_enable_switch">
+                            <property name="valign">center</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow">
-                        <property name="selectable">False</property>
-                        <property name="activatable">False</property>
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="can_focus">False</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Locate Pointer</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">locate_pointer_enable_switch</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkSwitch" id="locate_pointer_enable_switch">
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow">
+                        <property name="title" translatable="yes">_Locate Pointer</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable-widget">locate_pointer_enable_switch</property>
+                        <child type="suffix">
+                          <object class="GtkSwitch" id="locate_pointer_enable_switch">
+                            <property name="valign">center</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="click_assist_row">
-                        <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Click Assist</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="click_assist_label">
-                                <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="xalign">1</property>
-                                <property name="label" translatable="yes">Off</property>
-                              </object>
-                            </child>
+                      <object class="AdwActionRow" id="click_assist_row">
+                        <property name="title" translatable="yes">_Click Assist</property>
+                        <property name="use-underline">True</property>
+                        <property name="activatable">True</property>
+                        <child type="suffix">
+                          <object class="GtkLabel" id="click_assist_label">
+                            <property name="valign">center</property>
+                            <property name="xalign">1</property>
                           </object>
                         </child>
                       </object>
                     </child>
                     <child>
-                      <object class="GtkListBoxRow" id="double_click_delay_row">
+                      <object class="AdwActionRow" id="double_click_delay_row">
+                        <property name="title" translatable="yes">_Double-Click Delay</property>
+                        <property name="use-underline">True</property>
                         <child>
-                          <object class="GtkBox">
-                            <child>
-                              <object class="GtkLabel">
-                                <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="xalign">0</property>
-                                <property name="label" translatable="yes">_Double-Click Delay</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkScale" id="double_click_delay_scale">
-                                <property name="hexpand">True</property>
-                                <property name="vexpand">True</property>
-                                <property name="adjustment">double_click_delay_adjustment</property>
-                                <property name="draw_value">False</property>
-                                <property name="margin_start">12</property>
-                                <property name="margin_end">12</property>
-                                <property name="margin_top">12</property>
-                                <property name="margin_bottom">12</property>
-                                <accessibility>
-                                  <property name="label" translatable="yes">Double-Click Delay</property>
-                                </accessibility>
-                              </object>
-                            </child>
+                          <object class="GtkScale" id="double_click_delay_scale">
+                            <property name="hexpand">True</property>
+                            <property name="vexpand">True</property>
+                            <property name="adjustment">double_click_delay_adjustment</property>
+                            <property name="draw_value">False</property>
+                            <accessibility>
+                              <property name="label" translatable="yes">Double-Click Delay</property>
+                            </accessibility>
                           </object>
                         </child>
                       </object>
@@ -663,20 +362,4 @@
       </object>
     </child>
   </template>
-  <object class="GtkSizeGroup">
-    <property name="mode">vertical</property>
-    <widgets>
-      <widget name="highcontrast_row"/>
-      <widget name="large_text_row"/>
-      <widget name="cursor_size_row"/>
-      <widget name="zoom_row"/>
-      <widget name="screen_reader_row"/>
-      <widget name="sound_keys_row"/>
-      <widget name="visual_alerts_row"/>
-      <widget name="screen_keyboard_row"/>
-      <widget name="accessx_row"/>
-      <widget name="mouse_keys_row"/>
-      <widget name="click_assist_row"/>
-    </widgets>
-  </object>
 </interface>