[gnome-music/wip/mschraal/gtk4-v2: 33/55] ui/PlaylistControls: Packing fixes for GTK4

[Marinus Schraal <mschraal src gnome org>]

commit b743696b03bd6e2831adebcf080070382d15599b
Author: Marinus Schraal <mschraal gnome org>
Date:   Mon Apr 12 00:03:30 2021 +0200

    ui/PlaylistControls: Packing fixes for GTK4

 data/ui/PlaylistControls.ui | 107 +++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 56 deletions(-)
---
diff --git a/data/ui/PlaylistControls.ui b/data/ui/PlaylistControls.ui
index badaf6743..8659040d7 100644
--- a/data/ui/PlaylistControls.ui
+++ b/data/ui/PlaylistControls.ui
@@ -46,57 +46,55 @@
           </object>
         </child>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">horizontal</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkEntry" id="_rename_entry">
+          <object class="GtkStackPage">
+            <property name="name">renaming_dialog</property>
+            <property name="child">
+              <object class="GtkBox">
+                <property name="can_focus">0</property>
+                <style>
+                  <class name="linked"/>
+                </style>
                 <child>
-                  <object class="GtkEventControllerKey" id="_rename_controller">
-                    <signal name="key-pressed" handler="_on_rename_entry_key_pressed" swapped="no"/>
+                  <object class="GtkEntry" id="_rename_entry">
+                    <child>
+                      <object class="GtkEventControllerKey" id="_rename_controller">
+                        <signal name="key-pressed" handler="_on_rename_entry_key_pressed" swapped="no"/>
+                      </object>
+                    </child>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="is_focus">True</property>
+                    <property name="has_focus">True</property>
+                    <property name="receives_default">1</property>
+                    <signal name="activate" handler="_on_playlist_renamed" swapped="no"/>
+                    <signal name="changed" handler="_on_rename_entry_changed" swapped="no"/>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkButton" id="_rename_done_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="label" translatable="yes">_Done</property>
+                    <property name="use_underline">True</property>
+                    <property name="valign">center</property>
+                    <property name="sensitive">True</property>
+                    <signal name="clicked" handler="_on_playlist_renamed" swapped="no"/>
+                    <style>
+                      <class name="suggested-action"/>
+                    </style>
                   </object>
                 </child>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="is_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="activate" handler="_on_playlist_renamed" swapped="no"/>
-                <signal name="changed" handler="_on_rename_entry_changed" swapped="no"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="_rename_done_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="label" translatable="yes">_Done</property>
-                <property name="use_underline">True</property>
-                <property name="valign">center</property>
-                <property name="sensitive">True</property>
-                <signal name="clicked" handler="_on_playlist_renamed" swapped="no" />
-                <style>
-                  <class name="suggested-action"/>
-                </style>
               </object>
-            </child>
+            </property>
           </object>
-          <packing>
-            <property name="name">renaming_dialog</property>
-          </packing>
         </child>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">0</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkLabel" id="_songs_count_label">
@@ -107,13 +105,11 @@
         <style>
           <class name="dim-label"/>
         </style>
+        <layout>
+          <property name="column">0</property>
+          <property name="row">1</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkMenuButton" id="_menubutton">
@@ -131,13 +127,12 @@
           <class name="image-button"/>
           <class name="circular"/>
         </style>
+        <layout>
+          <property name="column">1</property>
+          <property name="row">0</property>
+          <property name="row-span">2</property>
+        </layout>
       </object>
-      <packing>
-        <property name="left_attach">1</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">2</property>
-      </packing>
     </child>
   </template>
 </interface>