[gnome-themes-standard/wip/jimmac/updated-gtk2: 8/106] Fix workaround for drawing comboboxes with the right colour.

[Jakub Steiner <jimmac src gnome org>]

commit 72122676726d7b2bc39ad76b72d13e4a2c497233
Author: Juraj Fiala <doctorjellyface riseup net>
Date:   Fri Jan 1 22:20:56 2016 +0100

    Fix workaround for drawing comboboxes with the right colour.

 themes/Adwaita/gtk-2.0/main.rc |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc
index 6586eb9..3182b41 100644
--- a/themes/Adwaita/gtk-2.0/main.rc
+++ b/themes/Adwaita/gtk-2.0/main.rc
@@ -85,8 +85,8 @@ style "default" {
   fg[INSENSITIVE] = mix (0.5, @fg_color, @bg_color)
   fg[ACTIVE]      = @fg_color
 
-  text[NORMAL]      = @fg_color
-  text[PRELIGHT]    = @fg_color
+  text[NORMAL]      = @text_color
+  text[PRELIGHT]    = @text_color
   text[SELECTED]    = @selected_fg_color
   text[INSENSITIVE] = darker (@bg_color)
   text[ACTIVE]      = @selected_fg_color
@@ -747,7 +747,6 @@ style "menu_item" {
   # See https://bugs.freedesktop.org/show_bug.cgi?id = 38038
   bg[SELECTED] = @selected_fg_color
 
-  text[NORMAL]   = @text_color
   bg[PRELIGHT]   = @selected_bg_color
   fg[PRELIGHT]   = @selected_fg_color
   text[PRELIGHT] = @selected_fg_color
@@ -1771,6 +1770,11 @@ style "combobox_button" {
   ythickness = 2
 }
 
+style "combobox_cellview" {
+  text[NORMAL]   = @fg_color
+  text[PRELIGHT] = @fg_color
+}
+
 style "range" {
 
   engine "pixmap" {
@@ -1940,7 +1944,6 @@ style "separator_menu_item" {
 }
 
 style "treeview" {
-  text[NORMAL] = @text_color
   #base[ACTIVE] = @bg_color
 }
 
@@ -2165,7 +2168,9 @@ widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>" style
 
 # We also need to avoid changing fg color for the inactive notebook tab labels
 widget_class "*<GtkNotebook>.<GtkLabel>"    style "notebook_tab_label"
-#widget_class "*<GtkComboBox>*<GtkCellView>" style "combobox_cellview"
+
+# ComboBoxes tend to draw the button label with text[] instead of fg[], we need to fix that
+widget_class "*<GtkComboBox>*<GtkCellView>" style "combobox_cellview"
 
 # GTK tooltips
 widget "gtk-tooltip*" style "tooltips"