# HG changeset patch # User Claus Gittinger # Date 856914687 -3600 # Node ID 5fbcf4ce6a51ba957c7b594e044fb41a7c4ac3a6 # Parent eef045108fe0a2528f9cccee28008bda85688350 handle return as trigger - iff my view has explicit focus diff -r eef045108fe0 -r 5fbcf4ce6a51 ButtonC.st --- a/ButtonC.st Wed Feb 26 00:15:33 1997 +0100 +++ b/ButtonC.st Wed Feb 26 00:51:27 1997 +0100 @@ -469,8 +469,9 @@ "trigger on Return and space, if I am the focusView of my group (i.e. if I got an explicit focus)" - key == Character space ifTrue:[ - view hasFocus ifTrue:[ + view hasFocus ifTrue:[ + ((key == Character space) + or:[key == #Return]) ifTrue:[ "just simulate a buttonPress/release here." self buttonPress:1 x:0 y:0. self buttonRelease:1 x:0 y:0. @@ -479,7 +480,7 @@ ]. view keyPress:key x:x y:y - "Modified: 9.2.1996 / 23:11:58 / cg" + "Modified: 26.2.1997 / 00:50:25 / cg" ! performAction @@ -638,5 +639,5 @@ !ButtonController class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/Attic/ButtonC.st,v 1.39 1997-01-29 12:26:15 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/Attic/ButtonC.st,v 1.40 1997-02-25 23:51:27 cg Exp $' ! ! diff -r eef045108fe0 -r 5fbcf4ce6a51 ButtonController.st --- a/ButtonController.st Wed Feb 26 00:15:33 1997 +0100 +++ b/ButtonController.st Wed Feb 26 00:51:27 1997 +0100 @@ -469,8 +469,9 @@ "trigger on Return and space, if I am the focusView of my group (i.e. if I got an explicit focus)" - key == Character space ifTrue:[ - view hasFocus ifTrue:[ + view hasFocus ifTrue:[ + ((key == Character space) + or:[key == #Return]) ifTrue:[ "just simulate a buttonPress/release here." self buttonPress:1 x:0 y:0. self buttonRelease:1 x:0 y:0. @@ -479,7 +480,7 @@ ]. view keyPress:key x:x y:y - "Modified: 9.2.1996 / 23:11:58 / cg" + "Modified: 26.2.1997 / 00:50:25 / cg" ! performAction @@ -638,5 +639,5 @@ !ButtonController class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/ButtonController.st,v 1.39 1997-01-29 12:26:15 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/ButtonController.st,v 1.40 1997-02-25 23:51:27 cg Exp $' ! !