DSVColumnView.st
changeset 4644 a1734dfe9bfe
parent 4613 73e2facef522
child 4653 e760275fb093
--- a/DSVColumnView.st	Tue Jul 08 16:46:49 2014 +0200
+++ b/DSVColumnView.st	Tue Jul 08 22:47:52 2014 +0200
@@ -41,7 +41,9 @@
 		CheckToggleForm CheckToggleLevel CheckToggleExtent
 		ComboButtonForm ComboButtonLevel ComboButtonExtent
 		StopRedrawSignal RadioButtonActiveImage RadioButtonPassiveImage
-		PreselectAllWhenOpeningEditor'
+		PreselectAllWhenOpeningEditor
+		DefaultHilightForegroundColorNoFocus
+		DefaultHilightBackgroundColorNoFocus'
 	poolDictionaries:''
 	category:'Views-DataSet'
 !
@@ -208,6 +210,8 @@
 
     DefaultHilightForegroundColor := StyleSheet colorAt:#'selection.hilightForegroundColor' default:DefaultBackgroundColor.
     DefaultHilightBackgroundColor := StyleSheet colorAt:#'selection.hilightBackgroundColor' default:DefaultForegroundColor.
+    DefaultHilightForegroundColorNoFocus := StyleSheet colorAt:#'selection.hilightForegroundColorNoFocus'.
+    DefaultHilightBackgroundColorNoFocus := StyleSheet colorAt:#'selection.hilightBackgroundColorNoFocus'.
     DefaultHilightFrameColor      := StyleSheet colorAt:#'selection.hilightFrameColor'. "/ no default; nil means: no frame
 
     DefaultHilightForegroundColor = DefaultHilightBackgroundColor ifTrue:[
@@ -3139,12 +3143,15 @@
     ].
 
     selectionForegroundColorNoFocus isNil ifTrue:[
-        selectionForegroundColorNoFocus := selectionForegroundColor.
+        selectionForegroundColorNoFocus := DefaultHilightForegroundColorNoFocus ? selectionForegroundColor.
     ].
     selectionBackgroundColorNoFocus isNil ifTrue:[
-        selectionBackgroundColor notNil ifTrue:[
-            selectionBackgroundColorNoFocus := selectionBackgroundColor lightened.
-            "/ selectionBackgroundColorNoFocus := Color brightness:(selectionBackgroundColor "lightened" brightness).   "/ asGray.
+        selectionBackgroundColorNoFocus := DefaultHilightBackgroundColorNoFocus.
+        selectionBackgroundColorNoFocus isNil ifTrue:[
+            selectionBackgroundColor notNil ifTrue:[
+                selectionBackgroundColorNoFocus := selectionBackgroundColor lightened.
+                "/ selectionBackgroundColorNoFocus := Color brightness:(selectionBackgroundColor "lightened" brightness).   "/ asGray.
+            ].
         ].
     ].
     selectionFrameColorNoFocus isNil ifTrue:[
@@ -4804,10 +4811,10 @@
 !DSVColumnView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.298 2014-06-08 21:48:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.299 2014-07-08 20:47:52 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.298 2014-06-08 21:48:33 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DSVColumnView.st,v 1.299 2014-07-08 20:47:52 cg Exp $'
 ! !