hg/stx-libwidg: comparison Toggle.st

equal deleted inserted replaced

-:81e3409404d2
+:565b052f5277
 Toggle comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.10 1995-01-26 16:05:02 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.11 1995-02-06 00:53:28 claus Exp $
 '!
 !Toggle class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.10 1995-01-26 16:05:02 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Toggle.st,v 1.11 1995-02-06 00:53:28 claus Exp $
 "
 !
 documentation
 "
 "
 ! !
 !Toggle methodsFor:'initialization'!
-initialize
-super initialize.
-actionWhenPressed := true
-!
 initStyle
 super initStyle.
 showLamp := StyleSheet at:#toggleShowLamp default:false.
 showLamp ifTrue:[
 ].
 lampColor := StyleSheet at:#toggleLampColor default:Color yellow.
 lampWidth := (device horizontalPixelPerMillimeter * 1.8) rounded.
 lampHeight := (device verticalPixelPerMillimeter * 3.5) rounded.
+!
+defaultController
+^ ToggleController
 ! !
 !Toggle methodsFor:'accessing'!
 showLamp
 lampColor:aColor
 "change the color of the toggle-lamp"
 lampColor := aColor.
-(shown and:[showLamp and:[pressed]]) ifTrue:[
+(shown and:[showLamp and:[controller pressed]]) ifTrue:[
 	self redraw
 ]
 ! !
 toggleNoAction
 "toggle, but do NOT perform any action - can be used to change a toggle
 under program control (i.e. turn one toggle off from another one)"
-|newLevel|
+|newLevel pressed|
-pressed := pressed not.
+pressed := controller pressed not.
+controller pressed:pressed.
 pressed ifTrue:[
 	newLevel := onLevel.
 ] ifFalse:[
 	newLevel := offLevel.
 ].
 !
 toggle
 "toggle and perform the action"
-|action|
+|action pressed|
-enabled ifTrue:[
+controller enabled ifTrue:[
 	self toggleNoAction.
-	pressed ifTrue:[
+	(pressed := controller pressed) ifTrue:[
-	    action := pressActionBlock
+	    action := controller pressAction
 	] ifFalse:[
-	    action := releaseActionBlock
+	    action := controller releaseAction
 	].
 	action notNil ifTrue:[action value].
 	model notNil ifTrue:[
 	    model value:pressed.
 	    model changed
 	].
 	self changed
 ]
 ! !
-!Toggle methodsFor:'event handling'!
-buttonPress:button x:x y:y
-((button == 1) or:[button == #select]) ifTrue:[
-	self toggle
-] ifFalse:[
-	^ super buttonPress:button x:x y:y
-].
-!
-buttonRelease:button x:x y:y
-((button == 1) or:[button == #select]) ifFalse:[
-	^ super buttonRelease:button x:x y:y
-].
-"ignore"
-! !
 !Toggle methodsFor:'redrawing'!
 drawWith:fg and:bg
 "redraw myself with fg/bg. Use super to draw the label,
 drawing of the lamp is done here."
-|x y|
+|x y clr|
 super drawWith:fg and:bg.   "this draws the text"
 showLamp ifTrue:[
 	x := hSpace + margin.
 	y := (height - lampHeight) // 2.
 	self drawEdgesForX:x y:y width:lampWidth height:lampHeight level:-1.
-	pressed ifTrue:[
+	controller pressed ifTrue:[
-	    self paint:lampColor.
+	    clr := lampColor.
 	] ifFalse:[
-	    self paint:bgColor.
+	    clr := bgColor.
 	].
+	self paint:clr.
 	self fillRectangleX:x+2 y:y+2 width:lampWidth - 4 height:lampHeight - 4
 ]
 ! !

changeset 77	565b052f5277
parent 74	9d0d6a11939e
child 86	df2687090a7f