[banshee] Update to latest Hyena and adapt to API changes



commit f0488e75147f5d0bdbc98f31ef60bfaf6673cf39
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Mon Jun 23 16:19:29 2014 +0200

    Update to latest Hyena and adapt to API changes
    
    Also fix ColumnCellPodcast rendering, thanks to the now clearer API.

 .../Banshee.Collection.Gui/ColumnCellAlbum.cs      |    2 +-
 .../ColumnCellCreativeCommons.cs                   |    2 +-
 .../ColumnCellStatusIndicator.cs                   |    2 +-
 .../Banshee.Collection.Gui/ColumnCellTrack.cs      |    2 +-
 .../Banshee.Podcasting.Gui/ColumnCellPodcast.cs    |    7 ++++---
 .../ColumnCellPodcastStatusIndicator.cs            |    4 ++--
 src/Hyena                                          |    2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs 
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
index 0624052..122db37 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellAlbum.cs
@@ -74,7 +74,7 @@ namespace Banshee.Collection.Gui
             return new ColumnCellAlbumAccessible (BoundObject, this, parent);
         }
 
-        public override void Render (CellContext context, StateFlags state, double cellWidth, double 
cellHeight)
+        public override void Render (CellContext context, double cellWidth, double cellHeight)
         {
             if (BoundObject == null) {
                 return;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs 
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs
index be7da09..d3e2c9a 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellCreativeCommons.cs
@@ -56,7 +56,7 @@ namespace Banshee.Collection.Gui
             LoadPixbufs ();
         }
 
-        public override void Render (CellContext context, StateFlags state, double cellWidth, double 
cellHeight)
+        public override void Render (CellContext context, double cellWidth, double cellHeight)
         {
             context.Context.Translate (0, 0.5);
             int draw_x = 0;
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs 
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
index 65f7965..ebbf555 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellStatusIndicator.cs
@@ -229,7 +229,7 @@ namespace Banshee.Collection.Gui
             LoadPixbufs ();
         }
 
-        public override void Render (CellContext context, StateFlags state, double cellWidth, double 
cellHeight)
+        public override void Render (CellContext context, double cellWidth, double cellHeight)
         {
             TrackInfo track = BoundTrack;
             if (track == null) {
diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs 
b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
index 26def98..9bb6e23 100644
--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrack.cs
@@ -54,7 +54,7 @@ namespace Banshee.Collection.Gui
             }
         }
 
-        public override void Render (CellContext context, StateFlags state, double cellWidth, double 
cellHeight)
+        public override void Render (CellContext context, double cellWidth, double cellHeight)
         {
             if (BoundObject == null) {
                 return;
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs 
b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
index 2f0bf12..9905141 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcast.cs
@@ -60,7 +60,7 @@ namespace Banshee.Podcasting.Gui
             artwork_manager = ServiceManager.Get<ArtworkManager> ();
         }
 
-        public override void Render (CellContext context, StateFlags state, double cellWidth, double 
cellHeight)
+        public override void Render (CellContext context, double cellWidth, double cellHeight)
         {
             if (BoundObject == null) {
                 return;
@@ -91,8 +91,9 @@ namespace Banshee.Podcasting.Gui
 
             int fl_width = 0, fl_height = 0, sl_width = 0, sl_height = 0;
             context.Widget.StyleContext.Save ();
-            context.Widget.StyleContext.AddClass ("entry");
-            Cairo.Color text_color = CairoExtensions.GdkRGBAToCairoColor 
(context.Widget.StyleContext.GetColor (state));
+            context.Widget.StyleContext.AddClass ("cell");
+            context.StyleContext.State |= context.State;
+            Cairo.Color text_color = CairoExtensions.GdkRGBAToCairoColor 
(context.Widget.StyleContext.GetColor (context.StyleContext.State));
             context.Widget.StyleContext.Restore ();
             text_color.A = 0.75;
 
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs 
b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
index 587cb49..e3bbdb9 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellPodcastStatusIndicator.cs
@@ -85,7 +85,7 @@ namespace Banshee.Podcasting.Gui
             return i;
         }
 
-        public override void Render (CellContext context, StateFlags state, double cellWidth, double 
cellHeight)
+        public override void Render (CellContext context, double cellWidth, double cellHeight)
         {
             PodcastTrackInfo podcast = PodcastTrackInfo.From (BoundTrack);
             if (podcast != null) {
@@ -94,7 +94,7 @@ namespace Banshee.Podcasting.Gui
                 }
             }
 
-            base.Render (context, state, cellWidth, cellHeight);
+            base.Render (context, cellWidth, cellHeight);
         }
     }
 }
diff --git a/src/Hyena b/src/Hyena
index ca1af04..3e2604c 160000
--- a/src/Hyena
+++ b/src/Hyena
@@ -1 +1 @@
-Subproject commit ca1af0493ac6c8a462cc2d18589c232cf7fd058c
+Subproject commit 3e2604cf87e96666a90395b8c612c5f6018cbd16


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