gtk-engines r1113 - in trunk: . themes/Crux/gtk-2.0 themes/Industrial/gtk-2.0 themes/Mist/gtk-2.0

[bberg svn gnome org]

Author: bberg
Date: Sun Mar  2 17:11:27 2008
New Revision: 1113
URL: http://svn.gnome.org/viewvc/gtk-engines?rev=1113&view=rev

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

	* themes/Crux/gtk-2.0/gtkrc:
	* themes/Industrial/gtk-2.0/gtkrc:
	* themes/Mist/gtk-2.0/gtkrc:
	Port the workarounds for GtkComboBox (cell renderer),
	GtkCList/GtkCTree and GtkList to other color scheme supporting
	themes in gtk-engines.


Modified:
   trunk/ChangeLog
   trunk/themes/Crux/gtk-2.0/gtkrc
   trunk/themes/Industrial/gtk-2.0/gtkrc
   trunk/themes/Mist/gtk-2.0/gtkrc

Modified: trunk/themes/Crux/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Crux/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Crux/gtk-2.0/gtkrc	Sun Mar  2 17:11:27 2008
@@ -147,3 +147,46 @@
 # (It will involve setting different priorities, etc.)
 ################################
 widget "gtk-tooltip*" style "crux-tooltips"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "crux-text-is-fg-color-workaround"
+{
+	text[NORMAL]        = @fg_color
+	text[PRELIGHT]      = @fg_color
+	text[SELECTED]      = @selected_fg_color
+	text[ACTIVE]        = @fg_color
+	text[INSENSITIVE]   = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>"   style "crux-text-is-fg-color-workaround"
+
+style "crux-menuitem-text-is-fg-color-workaround"
+{
+	text[NORMAL]        = @fg_color
+	text[PRELIGHT]      = @selected_fg_color
+	text[SELECTED]      = @selected_fg_color
+	text[ACTIVE]        = @fg_color
+	text[INSENSITIVE]   = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*"   style "crux-menuitem-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
+# base color set.
+style "crux-fg-is-text-color-workaround"
+{
+	fg[NORMAL]      = @text_color
+	fg[PRELIGHT]    = @text_color
+	fg[ACTIVE]      = @selected_fg_color
+	fg[SELECTED]    = @selected_fg_color
+	fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "crux-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "crux-fg-is-text-color-workaround"
+
+

Modified: trunk/themes/Industrial/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Industrial/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Industrial/gtk-2.0/gtkrc	Sun Mar  2 17:11:27 2008
@@ -134,7 +134,6 @@
   bg[SELECTED]  = @selected_bg_color
   fg[PRELIGHT]  = @selected_fg_color
   fg[SELECTED]  = @selected_fg_color
-  text[PRELIGHT]  = @selected_fg_color
 }
 
 style "industrial-menubar"
@@ -246,3 +245,46 @@
 
 class "MetaFrames" style "metacity-frame"
 
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "industrial-text-is-fg-color-workaround"
+{
+	text[NORMAL]        = @fg_color
+	text[PRELIGHT]      = @fg_color
+	text[SELECTED]      = @selected_fg_color
+	text[ACTIVE]        = @fg_color
+	text[INSENSITIVE]   = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>"   style "industrial-text-is-fg-color-workaround"
+
+style "industrial-menuitem-text-is-fg-color-workaround"
+{
+	text[NORMAL]        = @fg_color
+	text[PRELIGHT]      = @selected_fg_color
+	text[SELECTED]      = @selected_fg_color
+	text[ACTIVE]        = @fg_color
+	text[INSENSITIVE]   = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*"   style "industrial-menuitem-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
+# base color set.
+style "industrial-fg-is-text-color-workaround"
+{
+	fg[NORMAL]      = @text_color
+	fg[PRELIGHT]    = @text_color
+	fg[ACTIVE]      = @selected_fg_color
+	fg[SELECTED]    = @selected_fg_color
+	fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "industrial-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "industrial-fg-is-text-color-workaround"
+
+

Modified: trunk/themes/Mist/gtk-2.0/gtkrc
==============================================================================
--- trunk/themes/Mist/gtk-2.0/gtkrc	(original)
+++ trunk/themes/Mist/gtk-2.0/gtkrc	Sun Mar  2 17:11:27 2008
@@ -59,8 +59,8 @@
 {
 	ythickness = 2
 	xthickness = 2
-        text[PRELIGHT]          = "#ffffff"
-        fg[PRELIGHT]          = "#ffffff"
+
+        fg[PRELIGHT]          = @selected_fg_color
 }
 
 style "menu" 
@@ -73,13 +73,49 @@
 class "GtkMenu" style "menu"
 class "*MenuItem*" style "menuitem"
 
-widget_class "*MenuItem*" style "menuitem"
-widget_class "*.GtkImageMenuItem.*" style "menuitem"
-widget_class "*.GtkAccelMenuItem.*" style "menuitem"
-widget_class "*.GtkRadioMenuItem.*" style "menuitem"
-widget_class "*.GtkCheckMenuItem.*" style "menuitem"
-widget_class "*.GtkMenu.*" style "menuitem"
+widget_class "*<GtkMenuItem>*" style "menuitem"
+
+
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "mist-text-is-fg-color-workaround"
+{
+        text[NORMAL]              = @fg_color
+        text[ACTIVE]              = @fg_color
+        text[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
+        text[PRELIGHT]            = @fg_color
+        text[SELECTED]            = @selected_fg_color
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>"   style "mist-text-is-fg-color-workaround"
 
+style "mist-menuitem-text-is-fg-color-workaround"
+{
+        text[NORMAL]              = @fg_color
+        text[ACTIVE]              = @fg_color
+        text[INSENSITIVE]         = mix (0.4, @fg_color, shade (0.85, @bg_color)) #shaded to bg[INSENSITIVE]
+        text[PRELIGHT]            = @selected_fg_color
+        text[SELECTED]            = @selected_fg_color
+}
+widget "*.gtk-combobox-popup-menu.*"   style "mist-menuitem-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
+# base color set.
+style "mist-fg-is-text-color-workaround"
+{
+        fg[NORMAL]            = @text_color
+        fg[ACTIVE]            = @text_color
+        fg[PRELIGHT]          = @text_color
+        fg[SELECTED]          = @selected_fg_color
+        fg[INSENSITIVE]       = mix (0.5, @text_color, @base_color)
+}
+widget_class "*<GtkListItem>*" style "mist-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "mist-fg-is-text-color-workaround"