--- a/Color.st Fri Sep 06 23:04:16 2002 +0200
+++ b/Color.st Fri Sep 06 23:07:14 2002 +0200
@@ -13,21 +13,21 @@
"{ Package: 'stx:libview' }"
Object subclass:#Color
- instanceVariableNames:'red green blue device colorId ditherForm replacementColor
- writable'
- classVariableNames:'MaxValue Cells Black White LightGrey Grey DarkGrey Pseudo0
- Pseudo1 PseudoAll Red Green Blue RetryAllocation DitherBits
- ColorErrorSignal ColorAllocationFailSignal InvalidColorNameSignal
- StandardColorValues Transparent'
- poolDictionaries:''
- category:'Graphics-Support'
+ instanceVariableNames:'red green blue device colorId ditherForm replacementColor
+ writable'
+ classVariableNames:'MaxValue Cells Black White LightGrey Grey DarkGrey Pseudo0
+ Pseudo1 PseudoAll Red Green Blue RetryAllocation DitherBits
+ ColorErrorSignal ColorAllocationFailSignal InvalidColorNameSignal
+ StandardColorValues Transparent'
+ poolDictionaries:''
+ category:'Graphics-Support'
!
Object subclass:#DeviceColorHandle
- instanceVariableNames:'device colorId'
- classVariableNames:''
- poolDictionaries:''
- privateIn:Color
+ instanceVariableNames:'device colorId'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:Color
!
!Color class methodsFor:'documentation'!
@@ -571,7 +571,7 @@
"handle image restarts and flush any device resource handles"
(something == #returnFromSnapshot) ifTrue:[
- Display notNil ifTrue:[
+ Display notNil ifTrue:[
Display visualType == #TrueColor ifTrue:[
Display releaseFixColors
] ifFalse:[
@@ -589,7 +589,7 @@
green:nG
blue:nB
on:Display
- ]
+ ]
]
]
]
@@ -935,9 +935,9 @@
] ifFalse:[
"/ ask display (if there is one) ...
- (Screen notNil
- and:[ (currScreen := Screen current) notNil])
- ifTrue:[
+ (Screen notNil
+ and:[ (currScreen := Screen current) notNil])
+ ifTrue:[
currScreen
getScaledRGBFromName:colorName
into:[:rr :gg :bb |
@@ -945,7 +945,7 @@
g := gg.
b := bb
].
- ]
+ ]
].
r notNil ifTrue:[
^ here scaledRed:r scaledGreen:g scaledBlue:b
@@ -3600,7 +3600,7 @@
!
newTileMorphRepresentative
- ^ ColorTileMorph new colorSwatchColor: self
+ ^ ColorTileMorph new colorSwatchColor: self
!
scaledPixelValue32
@@ -3610,35 +3610,6 @@
+ (self alphaByte bitShift:24)
!
-slightlyDarkened
- "return a new color, which is slightly darker than the receiver.
- Almost the same as darkened for Squeak compatibility."
-
- ^ self mixed:0.8333 with:Black
-
- "
- (Color red) darker
- (Color red) muchDarker
- (Color red) slightlyDarkened
- "
-
- "Modified: 11.6.1996 / 18:10:37 / cg"
-!
-
-slightlyLightened
- "return a new color, which is slightly lighter than the receiver.
- Almost the same as darkened for Squeak compatibility."
-
- ^ self mixed:0.2 with:White
-
- "
- (Color red) lighter
- (Color red) slightlyLightened
- "
-
- "Modified: 11.6.1996 / 18:10:37 / cg"
-!
-
veryMuchLighter
"return a new color, which is very much lighter than the receiver.
Added for Squeak compatibility."
@@ -5206,6 +5177,6 @@
!Color class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Color.st,v 1.171 2002-09-06 21:04:16 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Color.st,v 1.172 2002-09-06 21:07:14 cg Exp $'
! !
Color initialize!