hg/stx-libtool2: comparison ColorEditDialog.st

equal deleted inserted replaced

-:8ff3bd6f0820
+:f077161d5d57
 ! !
 !ColorEditDialog methodsFor:'accessing'!
 color
+|colorName|
+colorName := self colorName.
+colorName notEmptyOrNil ifTrue:[
+^ colorName asSymbol
+].
 ^Color redByte:(red value) greenByte:(green value) blueByte:(blue value)
 !
 color:aColor
-aColor notNil ifTrue:[
+aColor isNil ifTrue:[
+^ self
+].
+aColor isSymbol ifTrue:[
+self colorNameHolder value:aColor
+] ifFalse:[
 self red value:aColor redByte.
 self green value:aColor greenByte.
 self blue value:aColor blueByte.
 ]
 !
 colorChanged
 |clr|
 clr := self color.
-self setPreview:clr.
+clr isColor ifTrue:[
-self htmlColorNameHolder value:(clr htmlPrintString).
+"not a symbol"
+self setPreview:clr.
+self htmlColorNameHolder value:(clr htmlPrintString).
+].
 !
 colorNameChanged
 "compute rgb and hls (if possible)"
 clr := Color name:colorNameHolder value ifIllegal:nil.
 clr isNil ifTrue:[
 ^ self
 ].
-red   value:clr redByte withoutNotifying:self.
+self red   value:clr redByte withoutNotifying:self.
-green value:clr greenByte withoutNotifying:self.
+self green value:clr greenByte withoutNotifying:self.
-blue  value:clr blueByte withoutNotifying:self.
+self blue  value:clr blueByte withoutNotifying:self.
 h := clr hue.
 h notNil ifTrue:[
-hue        value:(h rounded) withoutNotifying:self.
+self hue        value:(h rounded) withoutNotifying:self.
 ].
-light      value:(clr light rounded) withoutNotifying:self.
+self light      value:(clr light rounded) withoutNotifying:self.
-saturation value:(clr saturation rounded) withoutNotifying:self.
+self saturation value:(clr saturation rounded) withoutNotifying:self.
 self colorChanged
 !
 copyColor

changeset 2279	f077161d5d57
parent 2274	e09282d74ec3
child 2326	f23fac376621