[gnome-music/wip/jfelder/baseview-must-die: 7/7] playlistsview: Remove unneeded GstStack



commit 6f55007aa702173a9a301e2d30d58f3f4cd59f2a
Author: Marinus Schraal <mschraal gnome org>
Date:   Tue May 26 23:15:43 2020 +0200

    playlistsview: Remove unneeded GstStack
    
    There is no point in using GtkStack.

 data/ui/PlaylistsView.ui          | 25 +++++++++----------------
 gnomemusic/views/playlistsview.py |  7 +++----
 2 files changed, 12 insertions(+), 20 deletions(-)
---
diff --git a/data/ui/PlaylistsView.ui b/data/ui/PlaylistsView.ui
index f1714731..4fffcc2d 100644
--- a/data/ui/PlaylistsView.ui
+++ b/data/ui/PlaylistsView.ui
@@ -1,29 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.18"/>
-  <template class="PlaylistsView" parent="GtkStack">
+  <template class="PlaylistsView" parent="GtkBox">
     <property name="visible">True</property>
     <child>
-      <object class="GtkBox" id="_main_container">
+      <object class="GtkScrolledWindow">
         <property name="visible">True</property>
+        <property name="width-request">220</property>
+        <style>
+          <class name="sidebar"/>
+        </style>
         <child>
-          <object class="GtkScrolledWindow" id="all_playlists">
+          <object class="GtkListBox" id="_sidebar">
+            <property name="selection-mode">single</property>
             <property name="visible">True</property>
-            <property name="width-request">220</property>
-            <style>
-              <class name="sidebar"/>
-            </style>
-            <child>
-              <object class="GtkListBox" id="_sidebar">
-                <property name="selection-mode">single</property>
-                <property name="visible">True</property>
-                <signal name="row-activated" handler="_on_playlist_activated" swapped="no"/>
-              </object>
-            </child>
+            <signal name="row-activated" handler="_on_playlist_activated" swapped="no"/>
           </object>
         </child>
-        <child>
-        </child>
       </object>
     </child>
   </template>
diff --git a/gnomemusic/views/playlistsview.py b/gnomemusic/views/playlistsview.py
index 58906280..21247067 100644
--- a/gnomemusic/views/playlistsview.py
+++ b/gnomemusic/views/playlistsview.py
@@ -32,7 +32,7 @@ from gnomemusic.widgets.playlisttile import PlaylistTile
 
 
 @Gtk.Template(resource_path="/org/gnome/Music/ui/PlaylistsView.ui")
-class PlaylistsView(Gtk.Stack):
+class PlaylistsView(Gtk.Box):
     """Main view for playlists"""
 
     __gtype_name__ = "PlaylistsView"
@@ -40,7 +40,6 @@ class PlaylistsView(Gtk.Stack):
     title = GObject.Property(
         type=str, default=_("Playlists"), flags=GObject.ParamFlags.READABLE)
 
-    _main_container = Gtk.Template.Child()
     _sidebar = Gtk.Template.Child()
 
     def __init__(self, application):
@@ -48,7 +47,7 @@ class PlaylistsView(Gtk.Stack):
 
         :param GtkApplication application: The application object
         """
-        super().__init__(transition_type=Gtk.StackTransitionType.CROSSFADE)
+        super().__init__()
 
         self.props.name = "playlists"
 
@@ -60,7 +59,7 @@ class PlaylistsView(Gtk.Stack):
         self._untouched_list = True
 
         self._playlist_widget = PlaylistsWidget(application, self)
-        self._main_container.add(self._playlist_widget)
+        self.add(self._playlist_widget)
 
         self._sidebar.bind_model(self._model, self._add_playlist_to_sidebar)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]