gtk-engines r1112 - in trunk: . themes/Clearlooks/gtk-2.0

[bberg svn gnome org]

Author: bberg
Date: Sun Mar  2 16:54:49 2008
New Revision: 1112
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1112&view=rev

Log:
2008-03-02  Benjamin Berg  <benjamin sipsolutions net>

	* themes/Clearlooks/gtk-2.0/gtkrc:
	Use the special name menus get for comboboxes to work around the text
	color bug. The old work around breaks radio/check menu items.


Modified:
   trunk/ChangeLog
   trunk/themes/Clearlooks/gtk-2.0/gtkrc

Modified: trunk/themes/Clearlooks/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Clearlooks/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Clearlooks/gtk-2.0/gtkrc	Sun Mar  2 16:54:49 2008
@@ -135,13 +135,6 @@
 	ythickness = 3
 
 	fg[PRELIGHT] = @selected_fg_color
-
-	# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
-	text[NORMAL]       = @fg_color
-	text[PRELIGHT]     = @selected_fg_color
-	text[SELECTED]     = @selected_fg_color
-	text[ACTIVE]       = @fg_color
-	text[INSENSITIVE]  = darker (@bg_color)
 }
 
 style "clearlooks-separator-menu-item"
@@ -378,7 +371,7 @@
 # Similar hack also in the menuitem style.
 # This style does not affect GtkComboBoxEntry, it does have an effect
 # on comboboxes in appears-as-list mode though.
-style "clearlooks-combobox-text-color-workaround"
+style "clearlooks-text-is-fg-color-workaround"
 {
 	text[NORMAL]      = @fg_color
 	text[PRELIGHT]    = @fg_color
@@ -386,7 +379,8 @@
 	text[ACTIVE]      = @fg_color
 	text[INSENSITIVE] = darker (@bg_color)
 }
-widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-combobox-text-color-workaround"
+widget_class "*.<GtkComboBox>.<GtkCellView>"   style "clearlooks-text-is-fg-color-workaround"
+widget "*.gtk-combobox-popup-menu.*"   style "clearlooks-text-is-fg-color-workaround"
 
 # Work around the usage of GtkLabel inside GtkListItems to display text.
 # This breaks because the label is shown on a background that is based on the