equal
deleted
inserted
replaced
578 color |
578 color |
579 |colorName| |
579 |colorName| |
580 |
580 |
581 colorName := self colorName. |
581 colorName := self colorName. |
582 colorName notEmptyOrNil ifTrue:[ |
582 colorName notEmptyOrNil ifTrue:[ |
583 "/ ^ Color name:(colorName asSymbol) |
583 ^ Color name:(colorName asSymbol) |
584 ^ colorName asSymbol |
|
585 ]. |
584 ]. |
586 ^ Color redByte:(red value) greenByte:(green value) blueByte:(blue value) |
585 ^ Color redByte:(red value) greenByte:(green value) blueByte:(blue value) |
587 ! |
586 ! |
588 |
587 |
589 color:aColor |
588 color:aColor |
602 |
601 |
603 colorName |
602 colorName |
604 ^ colorNameHolder value |
603 ^ colorNameHolder value |
605 ! |
604 ! |
606 |
605 |
|
606 colorNameOrColor |
|
607 |colorName| |
|
608 |
|
609 colorName := self colorName. |
|
610 colorName notEmptyOrNil ifTrue:[ |
|
611 "/ ^ Color name:(colorName asSymbol) |
|
612 ^ colorName asSymbol |
|
613 ]. |
|
614 ^ Color redByte:(red value) greenByte:(green value) blueByte:(blue value) |
|
615 ! |
|
616 |
607 htmlColorName |
617 htmlColorName |
608 ^ htmlColorNameHolder value |
618 ^ htmlColorNameHolder value |
609 ! ! |
619 ! ! |
610 |
620 |
611 !ColorEditDialog methodsFor:'actions'! |
621 !ColorEditDialog methodsFor:'actions'! |
612 |
622 |
613 colorChanged |
623 colorChanged |
614 |clr| |
624 |clr| |
615 |
625 |
616 clr := self color. |
626 clr := self colorNameOrColor. |
617 clr isColor ifTrue:[ |
627 clr isColor ifTrue:[ |
618 "not a symbol" |
628 "not a symbol" |
619 self setPreview:clr. |
629 self setPreview:clr. |
620 self htmlColorNameHolder value:(clr htmlPrintString) withoutNotifying:self. |
630 self htmlColorNameHolder value:(clr htmlPrintString) withoutNotifying:self. |
621 ]. |
631 ]. |