banshee r4118 - in trunk/banshee: . src/Clients/Nereid/Nereid src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView

[abock svn gnome org]

Author: abock
Date: Wed Jun  4 23:05:13 2008
New Revision: 4118
URL: http://svn.gnome.org/viewvc/banshee?rev=4118&view=rev

Log:
2008-06-04  Aaron Bockover  <abock gnome org>

    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs:
    Use Gtk.Rc.GetStyleByPaths to grab the GtkTreeView style directly and
    attach it to our ListView; this is the proper fix to bug (BGO #534731),
    though the bug in LP is again, still quite valid

    * src/Clients/Nereid/Nereid/PlayerInterface.cs:
    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs:
    Reverted the hacky version of my theme fix from earlier today



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs

Modified: trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs
==============================================================================
--- trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	(original)
+++ trunk/banshee/src/Clients/Nereid/Nereid/PlayerInterface.cs	Wed Jun  4 23:05:13 2008
@@ -172,7 +172,6 @@
             view_container = new ViewContainer ();
             
             source_view = new SourceView ();
-            ListViewBase.TreeViewStyleAdapter = source_view;
             composite_view = new CompositeTrackSourceContents ();
             
             Hyena.Widgets.ScrolledWindow source_scroll = new Hyena.Widgets.ScrolledWindow ();

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListViewBase.cs	Wed Jun  4 23:05:13 2008
@@ -33,50 +33,5 @@
 {
     public class ListViewBase : Widget
     {
-        private static TreeView tree_view;
-        public static TreeView TreeViewStyleAdapter {
-            get { return tree_view; }
-            set { tree_view = value; }
-        }
-        
-        public ListViewBase ()
-        {
-            if (TreeViewStyleAdapter != null) {
-                TreeViewStyleAdapter.StyleSet += OnTreeViewStyleAdapterStyleSet;
-            }
-        }
-        
-        public override void Dispose ()
-        {
-            if (TreeViewStyleAdapter != null) {
-                TreeViewStyleAdapter.StyleSet -= OnTreeViewStyleAdapterStyleSet;
-            }
-            
-            base.Dispose ();
-        }
-        
-        protected override void OnRealized ()
-        {
-            base.OnRealized ();
-            AdaptTreeViewStyle (TreeViewStyleAdapter);
-        }
-
-        private void OnTreeViewStyleAdapterStyleSet (object o, StyleSetArgs args)
-        {
-            AdaptTreeViewStyle (TreeViewStyleAdapter);
-        }
-        
-        public void AdaptTreeViewStyle (TreeView treeView)
-        {
-            if (treeView == null || !treeView.IsRealized) {
-                return;
-            }
-            
-            foreach (StateType state in Enum.GetValues (typeof (StateType))) {
-                ModifyBg (state, treeView.Style.Background (state));
-                ModifyFg (state, treeView.Style.Foreground (state));
-                ModifyBase (state, treeView.Style.Base (state));
-            }
-        }
     }
 }

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Windowing.cs	Wed Jun  4 23:05:13 2008
@@ -76,6 +76,8 @@
             event_window = new Gdk.Window (GdkWindow, attributes, attributes_mask);
             event_window.UserData = Handle;
             
+            Style = Gtk.Rc.GetStyleByPaths (Settings, "*.GtkTreeView", "*.GtkTreeView", GType);
+            
             OnDragSourceSet ();
             MoveResize (Allocation);