[gnome-music] starhandlerwidget: Specify the column to add the cell renderer to



commit 968f7eb15a88dbe38de0548a5517ff79cbf1ab6c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Dec 1 14:01:53 2016 +0100

    starhandlerwidget: Specify the column to add the cell renderer to
    
    Instead of assuming it is OK to append itself to cols[0], allow the
    caller to specify the column that will receive the cell renderer.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=779585

 gnomemusic/views/playlistview.py        |    2 +-
 gnomemusic/views/searchview.py          |    2 +-
 gnomemusic/views/songsview.py           |    3 ++-
 gnomemusic/widgets/starhandlerwidget.py |    9 ++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gnomemusic/views/playlistview.py b/gnomemusic/views/playlistview.py
index 5ac5421..f7923f4 100644
--- a/gnomemusic/views/playlistview.py
+++ b/gnomemusic/views/playlistview.py
@@ -167,7 +167,7 @@ class PlaylistView(BaseView):
                                  self._on_list_widget_title_render, None)
         cols[0].add_attribute(title_renderer, 'text', 2)
 
-        self._star_handler.add_star_renderers(list_widget, cols)
+        self._star_handler.add_star_renderers(list_widget, cols[0])
 
         duration_renderer = Gd.StyledTextRenderer(xpad=32, xalign=1.0)
         duration_renderer.add_class('dim-label')
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index ad5c0e3..3885646 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -287,7 +287,7 @@ class SearchView(BaseView):
                                  self._on_list_widget_title_render, None)
         cols[0].add_attribute(title_renderer, 'text', 2)
 
-        self._star_handler.add_star_renderers(list_widget, cols, hidden=False)
+        self._star_handler.add_star_renderers(list_widget, cols[0])
 
         cells = cols[0].get_cells()
         cols[0].reorder(cells[0], -1)
diff --git a/gnomemusic/views/songsview.py b/gnomemusic/views/songsview.py
index a44f282..0373e9f 100644
--- a/gnomemusic/views/songsview.py
+++ b/gnomemusic/views/songsview.py
@@ -162,7 +162,8 @@ class SongsView(BaseView):
         list_widget.add_renderer(title_renderer,
                                  self._on_list_widget_title_render, None)
         cols[0].add_attribute(title_renderer, 'text', 2)
-        self._star_handler.add_star_renderers(list_widget, cols)
+        self._star_handler.add_star_renderers(list_widget, cols[0])
+
         duration_renderer = Gd.StyledTextRenderer(xpad=32, xalign=1.0)
         duration_renderer.add_class('dim-label')
         col = Gtk.TreeViewColumn()
diff --git a/gnomemusic/widgets/starhandlerwidget.py b/gnomemusic/widgets/starhandlerwidget.py
index f6f5c23..1651b2a 100644
--- a/gnomemusic/widgets/starhandlerwidget.py
+++ b/gnomemusic/widgets/starhandlerwidget.py
@@ -106,19 +106,18 @@ class StarHandlerWidget(object):
         self._parent = parent
 
     @log
-    def add_star_renderers(self, list_widget, cols, hidden=False):
+    def add_star_renderers(self, list_widget, col, hidden=False):
         """Adds the star renderer column
 
         :param list_widget: The widget to add the favorites column
-        :param cols: List of the widgets GtkTreeViewColumns
+        :param col: GtkTreeViewColumn to use
         :param hidden: Visible state of the column
         """
         star_renderer = CellRendererClickablePixbuf()
         star_renderer.connect("clicked", self._on_star_toggled)
-        list_widget.add_renderer(star_renderer, lambda *args: None, None)
 
-        cols[0].clear_attributes(star_renderer)
-        cols[0].add_attribute(star_renderer, 'show_star', self._star_index)
+        col.pack_start(star_renderer, False)
+        col.add_attribute(star_renderer, 'show_star', self._star_index)
 
     @log
     def _on_star_toggled(self, widget, path):


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