hg/stx-libwidg: comparison ButtonC.st

equal deleted inserted replaced

-:53cbfeaa9c9a
+:3ee5ea99d0e2
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 Controller subclass:#ButtonController
-	 instanceVariableNames:'enabled pressed active entered triggerOnDown autoRepeat
+	 instanceVariableNames:'enabled pressed active entered isTriggerOnDown autoRepeat
 		repeatBlock initialDelay repeatDelay
-		pressActionBlock releaseActionBlock'
+		pressActionBlock releaseActionBlock isToggle'
 	 classVariableNames:''
 	 poolDictionaries:''
 	 category:'Interface-Support'
 !
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/Attic/ButtonC.st,v 1.5 1995-03-06 19:27:54 claus Exp $
+$Header: /cvs/stx/stx/libwidg/Attic/ButtonC.st,v 1.6 1995-05-03 00:28:46 claus Exp $
 "
 !
 documentation
 "
 Instance variables:
 enabled                 <Boolean>       pressing is allowed (default: true)
 pressed                 <Boolean>       true if currently pressed (read-only)
 entered                 <Boolean>       true if the cursor is currently in this view
-triggerOnDown           <Boolean>       controls if the action should be executed on
+isTriggerOnDown         <Boolean>       controls if the action should be executed on
 					      press or on release (default: on release).
 pressActionBlock        <Block>         block to evaluate when pressed (default: noop)
 releaseActionBlock      <Block>         block to evaluate when released (default: noop)
 autoRepeat              <Boolean>       auto-repeats when pressed long enough (default: false)
 initialDelay            <Number>        seconds till first auto-repeat (default: 0.2)
 pressed := false.
 entered := false.
 autoRepeat := false.
 initialDelay := self class defaultInitialDelay.
 repeatDelay := self class defaultRepeatDelay.
-triggerOnDown := false.
+isTriggerOnDown := false.
+isToggle := false.
 ! !
 !ButtonController methodsFor:'accessing'!
+beToggle
+"make the receiver act like a toggle"
+isTriggerOnDown := true.
+isToggle := true
+!
 beTriggerOnUp
 "make the receiver act on button release"
-triggerOnDown := false
+isTriggerOnDown := false
 !
 beTriggerOnDown
 "make the receiver act on button press"
-triggerOnDown := true
+isTriggerOnDown := true
 !
 triggerOnDown:aBoolean
 "set/clear the flag which controls if the action block is to be evaluated
 on press or on release.
 (see also ST-80 compatibility methods beTriggerOn*)"
-triggerOnDown := aBoolean
+isTriggerOnDown := aBoolean
 !
 isTriggerOnDown
 "return true, if I trigger on press
 (in contrast to triggering on up, which is the default)"
-^ triggerOnDown
+^ isTriggerOnDown
 !
 pressAction
 "return the pressAction; thats the block which gets evaluated
 when the button is pressed (if non-nil)"
 action:aBlock
 "convenient method: depending on the setting the triggerOnDown flag,
 either set the press-action clear any release-action or
 vice versa, set the release-action and clear the press-action."
-triggerOnDown ifTrue:[
+isTriggerOnDown ifTrue:[
 	releaseActionBlock := nil.
 	pressActionBlock := aBlock
 ] ifFalse:[
 	releaseActionBlock := aBlock.
 	pressActionBlock := nil
 pressed := aBoolean
 !
 active:aBoolean
 active := aBoolean
+!
+toggleNoAction
+"toggle, but do NOT perform any action"
+pressed ifTrue:[
+	view turnOff.
+	pressed := false.
+] ifFalse:[
+	view turnOn.
+	pressed := true.
+].
+!
+toggle
+"toggle and perform the action"
+enabled ifTrue:[
+	self toggleNoAction.
+	self performAction.
+	view sendChangeMessageWith:pressed.
+	view changed:#toggle with:pressed
+]
 ! !
 !ButtonController methodsFor:'event handling'!
+performAction
+|action|
+pressed ifTrue:[
+	action := pressActionBlock
+] ifFalse:[
+	action := releaseActionBlock
+].
+action notNil ifTrue:[action value].
+!
 buttonPress:button x:x y:y
-|sym|
+|sym action|
 (button == 1 or:[button == #select]) ifFalse:[
 	^ super buttonPress:button x:x y:y
 ].
-pressed ifFalse:[
+enabled ifTrue:[
-	enabled ifTrue:[
+	isToggle ifTrue:[
+	    self toggle.
+	    ^ self
+	].
+	pressed ifFalse:[
 	    pressed := true.
 	    view showActive.
 	    (pressActionBlock notNil or:[model notNil]) ifTrue:[
 		"
 		view device synchronizeOutput.
 	    ].
 	    active := true.
-	    pressActionBlock notNil ifTrue:[
+	    self performAction.
-		pressActionBlock value
-	    ].
+	    isTriggerOnDown ifTrue:[
-	    triggerOnDown ifTrue:[
 		"the ST-80 way of doing things"
 		view notNil ifTrue:[
 		    view sendChangeMessageWith:true
 		]
 	    ].
 |sym|
 (button == 1 or:[button == #select]) ifFalse:[
 	^ super buttonRelease:button x:x y:y
 ].
+isToggle ifTrue:[
+	^ self
+].
 pressed ifTrue:[
 	autoRepeat ifTrue:[
 	    Processor removeTimedBlock:repeatBlock
 	].
 	pressed := false.
 		    view device synchronizeOutput.
 		].
 		active := true.
-		releaseActionBlock notNil ifTrue:[
+		self performAction.
-		    releaseActionBlock value
-		].
+		isTriggerOnDown ifFalse:[
-		triggerOnDown ifFalse:[
 		    "the ST-80 way of doing things"
 		    view notNil ifTrue:[
 			view sendChangeMessageWith:false.
 		    ].
 		].
 entered := true.
 pressed ifTrue:[
 	"
 	 reentered after a leave with mouse-button down;
 	 restart autorepeating and/or if I am a button with
-	 triggerOnDown, show active again.
+	 isTriggerOnDown, show active again.
 	"
 	enabled ifTrue:[
 	    autoRepeat ifTrue:[
 		Processor addTimedBlock:repeatBlock afterSeconds:initialDelay
 	    ].
-	    triggerOnDown ifFalse:[
+	    isTriggerOnDown ifFalse:[
 		view showActive.
 	    ]
 	]
 ] ifFalse:[
 	enabled ifTrue:[
 	 action on release, show passive
 	"
 	autoRepeat ifTrue:[
 	    Processor removeTimedBlock:repeatBlock
 	].
-	triggerOnDown ifFalse:[
+	isTriggerOnDown ifFalse:[
 	    view showPassive.
 	]
 ] ifFalse:[
 	enabled ifTrue:[
 	    view redraw

changeset 118	3ee5ea99d0e2
parent 97	cbf495fe3b64
child 121	4e63bbdb266a