--- a/ColorEditDialog.st Wed Aug 19 20:34:46 2009 +0200
+++ b/ColorEditDialog.st Fri Sep 11 16:42:02 2009 +0200
@@ -580,8 +580,7 @@
colorName := self colorName.
colorName notEmptyOrNil ifTrue:[
- "/ ^ Color name:(colorName asSymbol)
- ^ colorName asSymbol
+ ^ Color name:(colorName asSymbol)
].
^ Color redByte:(red value) greenByte:(green value) blueByte:(blue value)
!
@@ -604,6 +603,17 @@
^ colorNameHolder value
!
+colorNameOrColor
+ |colorName|
+
+ colorName := self colorName.
+ colorName notEmptyOrNil ifTrue:[
+ "/ ^ Color name:(colorName asSymbol)
+ ^ colorName asSymbol
+ ].
+ ^ Color redByte:(red value) greenByte:(green value) blueByte:(blue value)
+!
+
htmlColorName
^ htmlColorNameHolder value
! !
@@ -613,7 +623,7 @@
colorChanged
|clr|
- clr := self color.
+ clr := self colorNameOrColor.
clr isColor ifTrue:[
"not a symbol"
self setPreview:clr.