banshee r4571 - in trunk/banshee: . src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView

[abock svn gnome org]

Author: abock
Date: Fri Sep 19 00:14:00 2008
New Revision: 4571
URL: http://svn.gnome.org/viewvc/banshee?rev=4571&view=rev

Log:
2008-09-18  Aaron Bockover  <abock gnome org>

    * src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:
    Force the foreground color of embedded menu labels in the prelight state
    to use the foreground color from the selected state (BGO #524897)



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs

Modified: trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs
==============================================================================
--- trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs	(original)
+++ trunk/banshee/src/Libraries/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs	Fri Sep 19 00:14:00 2008
@@ -463,12 +463,26 @@
         {
             private Column column;
             private bool ready = false;
+            private Label label;
             
-            public ColumnToggleMenuItem (Column column) : base (column.LongTitle ?? String.Empty)
+            public ColumnToggleMenuItem (Column column) : base ()
             {
                 this.column = column;
                 Active = column.Visible; 
                 ready = true;
+                
+                label = new Label ();
+                label.Xalign = 0.0f;
+                label.Text = column.LongTitle ?? String.Empty;
+                label.Show ();
+                
+                Add (label);
+            }
+                        
+            protected override void OnStyleSet (Style previousStyle)
+            {
+                base.OnStyleSet (previousStyle);
+                label.ModifyFg (StateType.Prelight, label.Style.Foreground (StateType.Selected));
             }
             
             protected override void OnActivated ()
@@ -486,13 +500,14 @@
         private class ColumnHideMenuItem : ImageMenuItem
         {
             private Column column;
+            private Label label;
             
             public ColumnHideMenuItem (Column column) : base ()
             {
                 this.column = column;
                 this.Image = new Image (Stock.Remove, IconSize.Menu);
                 
-                Label label = new Label ();
+                label = new Label ();
                 label.Xalign = 0.0f;
                 label.Markup = String.Format (Catalog.GetString ("Hide <i>{0}</i>"), 
                     GLib.Markup.EscapeText (column.LongTitle));
@@ -501,6 +516,12 @@
                 Add (label);
             }
             
+            protected override void OnStyleSet (Style previousStyle)
+            {
+                base.OnStyleSet (previousStyle);
+                label.ModifyFg (StateType.Prelight, label.Style.Foreground (StateType.Selected));
+            }
+            
             protected override void OnActivated ()
             {
                 column.Visible = false;