[gnome-maps/wip/cdavis/post-port-cleanups: 22/22] shape-layer-row: Modernize widget heirarchy

[Marcus Lundblad <mlundblad src gnome org>]

commit 4e29e94550f62e18924af87de6db658249e75994
Author: Christopher Davis <christopherdavis gnome org>
Date:   Sun Aug 21 17:57:19 2022 -0400

    shape-layer-row: Modernize widget heirarchy

 data/ui/shape-layer-row.ui | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/data/ui/shape-layer-row.ui b/data/ui/shape-layer-row.ui
index a27d251a..56ba3557 100644
--- a/data/ui/shape-layer-row.ui
+++ b/data/ui/shape-layer-row.ui
@@ -1,43 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="Gjs_ShapeLayerRow" parent="GtkListBoxRow">
-    <property name="visible">True</property>
+    <accessibility>
+      <relation name="labelled-by">layerLabel</relation>
+    </accessibility>
     <child>
       <object class="GtkBox">
         <property name="name">layers-row-box</property>
-        <property name="visible">True</property>
         <property name="orientation">horizontal</property>
-        <property name="spacing">4</property>
-        <style>
-          <class name="horizontal"/>
-        </style>
+        <property name="spacing">6</property>
+        <property name="margin-top">6</property>
+        <property name="margin-bottom">6</property>
         <child>
-          <object class="GtkButton" id="visibleButton">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="tooltip-text" translatable="yes" comments="Translators: This is a 
tooltip">Toggle visible</property>
-            <property name="icon-name">layer-visible-symbolic</property>
+          <object class="GtkSeparator">
             <style>
-              <class name="flat"/>
+              <class name="spacer"/>
             </style>
           </object>
         </child>
         <child>
           <object class="GtkLabel" id="layerLabel">
-            <property name="visible">True</property>
-            <property name="hexpand">1</property>
+            <property name="hexpand">True</property>
             <property name="ellipsize">end</property>
-            <property name="max-width-chars">1</property>
             <property name="xalign">0</property>
           </object>
         </child>
+        <child>
+          <object class="GtkButton" id="visibleButton">
+            <property name="hexpand">True</property>
+            <property name="halign">end</property>
+            <property name="tooltip-text" translatable="yes" comments="Translators: This is a 
tooltip">Toggle visible</property>
+            <property name="icon-name">layer-visible-symbolic</property>
+            <style>
+              <class name="flat"/>
+              <class name="circular"/>
+            </style>
+          </object>
+        </child>
         <child>
           <object class="GtkButton" id="closeButton">
-            <property name="visible">True</property>
+            <property name="hexpand">True</property>
+            <property name="halign">end</property>
+            <property name="tooltip-text" translatable="yes" comments="Translators: This is a 
tooltip">Remove Shape Layer</property>
             <property name="icon_name">window-close-symbolic</property>
             <style>
               <class name="flat"/>
+              <class name="circular"/>
             </style>
           </object>
         </child>