--- a/ColorMenu.st Mon Jan 19 11:47:54 1998 +0100
+++ b/ColorMenu.st Mon Jan 19 12:36:41 1998 +0100
@@ -86,8 +86,7 @@
"
^ #(
- #( 'B/W'
- gray
+ #( gray
gray:
#( white
veryLightGray
@@ -99,26 +98,22 @@
)
)
- #( 'R'
- red
+ #( red
red:
#( lightened 100 80 60 40 )
)
- #( 'G'
- green
+ #( green
green:
#( lightened 100 80 60 40 )
)
- #( 'B'
- blue
+ #( blue
blue:
#( lightened 100 80 60 40 )
)
- #( 'C'
- cyan
+ #( cyan
#'cyan:magenta:yellow:'
#(
lightened
@@ -130,8 +125,7 @@
)
)
- #( 'M'
- magenta
+ #( magenta
#'cyan:magenta:yellow:'
#(
lightened
@@ -143,8 +137,7 @@
)
)
- #( 'Y'
- yellow
+ #( yellow
#'cyan:magenta:yellow:'
#(
lightened
@@ -169,12 +162,12 @@
self colorDefinition do:[:aSlice|
|size colOp color item smenu|
- mainCol := Color perform:(aSlice at:2).
- item := MenuItem labeled:(Text string:(aSlice at:1) emphasis:(#backgroundColor->mainCol)).
+ mainCol := Color perform:(aSlice at:1).
+ item := MenuItem labeled:(Text string:' ' emphasis:(#backgroundColor->mainCol)).
smenu := Menu new.
- colOp := aSlice at:3.
+ colOp := aSlice at:2.
- (aSlice at:4) do:[:el||sitem label|
+ (aSlice at:3) do:[:el||sitem label|
el isSymbol ifTrue:[
color := el == #lightened ifTrue:[mainCol perform:el] ifFalse:[Color perform:el].
label := el.
@@ -379,6 +372,6 @@
!ColorMenu class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.8 1998-01-19 08:27:13 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/ColorMenu.st,v 1.9 1998-01-19 11:36:41 ca Exp $'
! !
ColorMenu initialize!