hg/stx-libwidg: comparison Button.st

equal deleted inserted replaced

-:432d4d3f5717
+:63a4957ce918
 drawWith:fg and:bg
 "redraw myself with fg/bg. Use super to draw the label, add
 the return-arrow here."
-|x y sColor lColor etchFg savLogo shownLogo isEnabled|
+|x y sColor lColor etchFg shownLogo isEnabled|
 shown ifFalse:[^ self].
 isEnabled := self enabled.
 isEnabled ifFalse:[
 etchFg := disabledEtchedFgColor.
 ].
-(controller active or:[controller pressed]) ifTrue:[
+false ifTrue:[
-shownLogo := activeLogo ? enteredLogo ? passiveLogo ? logo.
+"/ that breaks the checkToggle - it MUST be done elsewhere
-] ifFalse:[
+"/ never ever change the label from within the redraw method !!!!!!
-shownLogo := passiveLogo ? logo.
+(controller active or:[controller pressed]) ifTrue:[
-(enteredLogo notNil and:[controller entered]) ifTrue:[
+shownLogo := activeLogo ? enteredLogo ? passiveLogo ? logo.
-shownLogo := enteredLogo.
+] ifFalse:[
+shownLogo := passiveLogo ? logo.
+(enteredLogo notNil and:[controller entered]) ifTrue:[
+shownLogo := enteredLogo.
+].
 ].
-].
+(disabledLogo notNil and:[isEnabled not]) ifTrue:[
-(disabledLogo notNil and:[isEnabled not]) ifTrue:[
+shownLogo := disabledLogo.
-shownLogo := disabledLogo.
+].
-].
+shownLogo ~= logo ifTrue:[
-shownLogo ~= logo ifTrue:[
+self label:shownLogo redraw:false.
-self label:shownLogo.
+].
 ].
 self drawWith:fg and:bg clearInside:true etchedFg:etchFg.   "this draws the text/image"
 (isReturnButton and:[shadowForm notNil]) ifTrue:[
 self drawWin95FocusFrame
 ]
 ].
 ]
-"Modified: / 18.9.1998 / 16:55:38 / cg"
+"Modified: / 13-10-2010 / 12:43:52 / cg"
 !
 redraw
 "redraw the button.
 Thats like redrawing a label, but use different colors when pressed
 ! !
 !Button class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.149 2009-12-07 14:58:09 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.150 2010-10-13 10:44:34 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.149 2009-12-07 14:58:09 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.150 2010-10-13 10:44:34 cg Exp $'
 ! !

changeset 4173	63a4957ce918
parent 4128	2fd581e2cf68
child 4179	2859d7731149