NoteBookView.st
changeset 4155 fbb899a80326
parent 4121 9e7942ceeada
child 4158 dc5245affaeb
--- a/NoteBookView.st	Tue Dec 11 15:37:03 2012 +0100
+++ b/NoteBookView.st	Tue Dec 11 16:44:10 2012 +0100
@@ -708,15 +708,14 @@
         super viewBackground:aColor.
         backgroundColor := viewBackground.
         activeBackgroundColor := backgroundColor.
-
-        backgroundColor brightness < 0.5 ifTrue:[
-            foregroundColor := Color white.
+        foregroundColor := backgroundColor contrastingBlackOrWhite.
+        activeForegroundColor := foregroundColor.
+
+        foregroundColor = Color white ifTrue:[
             disabledForegroundColor := Color veryLightGray.
         ] ifFalse:[
-            foregroundColor := Color black.
             disabledForegroundColor := backgroundColor darker.
         ].
-        activeForegroundColor := foregroundColor.
     ].
 ! !
 
@@ -3739,5 +3738,5 @@
 !NoteBookView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/NoteBookView.st,v 1.174 2012-04-21 17:14:59 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/NoteBookView.st,v 1.175 2012-12-11 15:44:10 stefan Exp $'
 ! !