drop use of gtk_entry_* colors (except cursor); use original base/text choices but...

diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 3a418b9d8dad01bed7992d808dd5a3fe55b7b66a..7a63698fd0c515c0ca363f64bde2b799ed1b6d3d 100644 (file)
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -126,14 +126,14 @@ style "default" = "medium_text"
   base[NORMAL]        = @bases
   base[PRELIGHT]      = @bases
   base[INSENSITIVE]   = shade(1.0, @background)
-  base[ACTIVE]        = shade(0.9, @bg_selected)
-  base[SELECTED]      = @bg_selected
+  base[ACTIVE]        = shade(0.9, @bg_selected) /* base for focused, selected text */
+  base[SELECTED]      = @bg_selected /* base for non-focused, selected text */
 
   text[NORMAL]        = @texts
   text[PRELIGHT]      = @texts
   text[ACTIVE]        = @fg_selected
-  text[INSENSITIVE]   = shade(0.7, @lightest)
-  text[SELECTED]      = @fg_selected
+  text[INSENSITIVE]   = shade(0.7, @lightest) /* text color for focused selected text */
+  text[SELECTED]      = @fg_selected          /* text color for non-focused selected text */
 
 #engine specific tweaks
 
@@ -155,17 +155,17 @@ style "entry"
 
   # special base + text for GtkEntry to aid with visibility during text entry
 
-  base[NORMAL]      = @entry_base
-  base[PRELIGHT]    = @entry_base
-  base[INSENSITIVE] = @entry_base
-  base[ACTIVE]      = @entry_base_selected /* base for focused, selected text */
-  base[SELECTED]    = @entry_base_selected   /* base for non-focused, selected text */
+  base[NORMAL]      = @bases
+  base[PRELIGHT]    = @bases
+  base[INSENSITIVE] = @bases
+  base[ACTIVE]      = @bg_selected
+  base[SELECTED]    = @bg_selected
 
-  text[NORMAL]      = @entry_text
-  text[PRELIGHT]    = @entry_text
-  text[INSENSITIVE] = shade (0.92, @entry_text)
-  text[ACTIVE]      = @entry_text_selected
-  text[SELECTED]    = @entry_text_selected
+  text[NORMAL]      = @texts
+  text[PRELIGHT]    = @texts
+  text[INSENSITIVE] = shade (0.92, @texts)
+  text[ACTIVE]      = @fg_selected
+  text[SELECTED]    = @fg_selected
 }
 
 style "treeview_parent_node"
@@ -1038,8 +1038,8 @@ style "vca_label_bar" = "medium_bold_text"
 }
 
 class "GtkWidget" style:highest "default"
-class "GtkSpinButton" style:highest "default"
 class "GtkEntry" style:highest "entry"
+class "GtkSpinButton" style:highest "default"
 class "GtkScrollbar" style:highest "ardour_adjusters"
 class "GtkLabel" style:highest "default_generic"
 class "GtkButton" style:highest "ardour_button"