[gnome-music/wip/mschraal/core: 176/208] searchview: Add a box to contain all search results



commit b229140db5f7b59a6fdcaf9f796c2bc88e574da5
Author: Marinus Schraal <mschraal gnome org>
Date:   Mon Jul 1 10:01:49 2019 +0200

    searchview: Add a box to contain all search results

 gnomemusic/views/baseview.py   |  2 +-
 gnomemusic/views/searchview.py | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/gnomemusic/views/baseview.py b/gnomemusic/views/baseview.py
index c1794c9b..af5dd5f8 100644
--- a/gnomemusic/views/baseview.py
+++ b/gnomemusic/views/baseview.py
@@ -87,7 +87,7 @@ class BaseView(Gtk.Stack):
 
         self.add(self._grid)
         self.show_all()
-        self._view.hide()
+        # self._view.hide()
 
         self._init = False
         grilo.connect('ready', self._on_grilo_ready)
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index f6f4fc38..4bff4e70 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -87,16 +87,16 @@ class SearchView(BaseView):
         self._search_mode_active = False
         # self.connect("notify::search-state", self._on_search_state_changed)
 
-        self._view.show_all()
-
     @log
     def _setup_view(self):
         view_container = Gtk.ScrolledWindow(hexpand=True, vexpand=True)
         self._box.pack_start(view_container, True, True, 0)
 
-        self._view = Gtk.ListBox()
+        self._songs_listbox = Gtk.ListBox()
+        self._songs_listbox.bind_model(self._model, self._create_song_widget)
 
-        self._view.bind_model(self._model, self._create_song_widget)
+        self._all_results_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
+        self._all_results_box.pack_start(self._songs_listbox, True, True, 0)
 
         # self._view = Gtk.TreeView(
         #     activate_on_single_click=True, can_focus=False,
@@ -111,7 +111,9 @@ class SearchView(BaseView):
         # self._ctrl.props.propagation_phase = Gtk.PropagationPhase.CAPTURE
         # self._ctrl.connect("released", self._on_view_clicked)
 
-        view_container.add(self._view)
+        view_container.add(self._all_results_box)
+
+        self._box.show_all()
 
     def _create_song_widget(self, coresong):
         song_widget = SongWidget(coresong.props.media)
@@ -170,7 +172,7 @@ class SearchView(BaseView):
                 song_widget = child.get_child()
                 song_widget.props.selected = True
 
-            self._view.foreach(child_select_all)
+            self._songs_listbox.foreach(child_select_all)
 
     def unselect_all(self):
         with self._model.freeze_notify():
@@ -178,7 +180,7 @@ class SearchView(BaseView):
                 song_widget = child.get_child()
                 song_widget.props.selected = False
 
-            self._view.foreach(child_select_none)
+            self._songs_listbox.foreach(child_select_none)
 
     @log
     def _back_button_clicked(self, widget, data=None):


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