Mercurial Mercurial > hg > stx-libwidg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disabled fg-color
authorClaus Gittinger <cg@exept.de>
Wed, 21 Apr 1999 23:24:42 +0200
changeset 1853 f5223ad8378e
parent 1852 0acc83cddbc8
child 1854 2376625c49b3
disabled fg-color
ChckTggle.st file | annotate | diff | comparison | revisions
CheckToggle.st file | annotate | diff | comparison | revisions 
--- a/ChckTggle.st	Wed Apr 21 23:12:10 1999 +0200
+++ b/ChckTggle.st	Wed Apr 21 23:24:42 1999 +0200
@@ -449,6 +449,8 @@
         passiveLogo := DefaultPassiveImage onDevice:device.
     ].
 
+    disabledFgColor := styleSheet at:#'checkToggle.disabledForegroundColor' default:disabledFgColor.
+
     DefaultActiveFGColor notNil ifTrue:[
         self activeForegroundColor:DefaultActiveFGColor
     ].
@@ -513,20 +515,21 @@
 drawWith:fg and:bg
     |bgColorUsed|
 
+    bgColorUsed := bg.
+
     controller pressed ifTrue:[
         logo := activeLogo.
+        bgColorUsed := activeBgColor.
     ] ifFalse:[
         logo := passiveLogo.
+        bgColorUsed := bgColor.
     ].
 
-    bgColorUsed := bg.
-
     (controller entered 
     and:[enteredBgColor notNil]) ifTrue:[
         bgColorUsed := enteredBgColor
     ] ifFalse:[
 "/        bgColorUsed := bgColor 
-        bgColorUsed := activeBgColor.
     ].
     super drawWith:fg and:bgColorUsed 
 
@@ -552,5 +555,5 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.46 1999-04-21 21:12:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.47 1999-04-21 21:24:42 cg Exp $'
 ! !
--- a/CheckToggle.st	Wed Apr 21 23:12:10 1999 +0200
+++ b/CheckToggle.st	Wed Apr 21 23:24:42 1999 +0200
@@ -449,6 +449,8 @@
         passiveLogo := DefaultPassiveImage onDevice:device.
     ].
 
+    disabledFgColor := styleSheet at:#'checkToggle.disabledForegroundColor' default:disabledFgColor.
+
     DefaultActiveFGColor notNil ifTrue:[
         self activeForegroundColor:DefaultActiveFGColor
     ].
@@ -513,20 +515,21 @@
 drawWith:fg and:bg
     |bgColorUsed|
 
+    bgColorUsed := bg.
+
     controller pressed ifTrue:[
         logo := activeLogo.
+        bgColorUsed := activeBgColor.
     ] ifFalse:[
         logo := passiveLogo.
+        bgColorUsed := bgColor.
     ].
 
-    bgColorUsed := bg.
-
     (controller entered 
     and:[enteredBgColor notNil]) ifTrue:[
         bgColorUsed := enteredBgColor
     ] ifFalse:[
 "/        bgColorUsed := bgColor 
-        bgColorUsed := activeBgColor.
     ].
     super drawWith:fg and:bgColorUsed 
 
@@ -552,5 +555,5 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.46 1999-04-21 21:12:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.47 1999-04-21 21:24:42 cg Exp $'
 ! !
hg/stx-libwidg