--- a/WindowGroup.st Wed Feb 07 15:14:59 1996 +0100
+++ b/WindowGroup.st Wed Feb 07 15:24:46 1996 +0100
@@ -756,84 +756,84 @@
self processExposeEvents.
[mySensor hasEvents] whileTrue:[
- event := mySensor nextEvent.
- event notNil ifTrue:[
- (views notNil or:[topViews notNil]) ifTrue:[
- ignore := false.
+ event := mySensor nextEvent.
+ event notNil ifTrue:[
+ (views notNil or:[topViews notNil]) ifTrue:[
+ ignore := false.
- (preEventHook notNil
- and:[preEventHook processEvent:event]) ifTrue:[
- ignore := true.
- ].
- ignore ifFalse:[
- "/
- "/ FocusStepping is done right here
- "/
- event isKeyPressEvent ifTrue:[
- (key := event key) == #FocusNext ifTrue:[
- self focusNext.
- ignore := true
- ].
- key == #FocusPrevious ifTrue:[
- self focusPrevious.
- ignore := true
- ].
- key == #Tab ifTrue:[
- focusView notNil ifTrue:[
- focusView canTab ifTrue:[
- self focusNext.
- ignore := true
- ]
- ] ifFalse:[
- pointerView notNil ifTrue:[
- pointerView canTab ifTrue:[
- self focusNext.
- ignore := true.
- ]
- ] ifFalse:[
- self focusNext.
- ignore := true.
- ]
- ]
- ].
- key == #Escape ifTrue:[
- isModal ifTrue:[
- topViews first hideRequest
- ]
- ]
- ].
- event isPointerEnterEvent ifTrue:[
- pointerView := event view
- ].
- event isPointerLeaveEvent ifTrue:[
- pointerView := nil
- ].
+ (preEventHook notNil
+ and:[preEventHook processEvent:event]) ifTrue:[
+ ignore := true.
+ ].
+ ignore ifFalse:[
+ "/
+ "/ FocusStepping is done right here
+ "/
+ event isKeyPressEvent ifTrue:[
+ (key := event key) == #FocusNext ifTrue:[
+ self focusNext.
+ ignore := true
+ ].
+ key == #FocusPrevious ifTrue:[
+ self focusPrevious.
+ ignore := true
+ ].
+"/ key == #Tab ifTrue:[
+"/ focusView notNil ifTrue:[
+"/ focusView canTab ifTrue:[
+"/ self focusNext.
+"/ ignore := true
+"/ ]
+"/ ] ifFalse:[
+"/ pointerView notNil ifTrue:[
+"/ pointerView canTab ifTrue:[
+"/ self focusNext.
+"/ ignore := true.
+"/ ]
+"/ ] ifFalse:[
+"/ self focusNext.
+"/ ignore := true.
+"/ ]
+"/ ]
+"/ ].
+ key == #Escape ifTrue:[
+ isModal ifTrue:[
+ topViews first hideRequest
+ ]
+ ]
+ ].
+ event isPointerEnterEvent ifTrue:[
+ pointerView := event view
+ ].
+ event isPointerLeaveEvent ifTrue:[
+ pointerView := nil
+ ].
- ignore ifFalse:[
- "/
- "/ button events turn off explicit focus, and revert
- "/ to implicit focus control
- "/
- (focusView notNil
- and:[event isButtonEvent]) ifTrue:[
- self focusView:nil
- ].
- "/
- "/ let the event forward itself
- "/
- LastActiveGroup := self.
- LastActiveProcess := Processor activeProcess.
- event sendEventWithFocusOn:focusView.
- ]
- ].
- postEventHook notNil ifTrue:[
- postEventHook processEvent:event
- ]
- ]
- ].
+ ignore ifFalse:[
+ "/
+ "/ button events turn off explicit focus, and revert
+ "/ to implicit focus control
+ "/
+ (focusView notNil
+ and:[event isButtonEvent]) ifTrue:[
+ self focusView:nil
+ ].
+ "/
+ "/ let the event forward itself
+ "/
+ LastActiveGroup := self.
+ LastActiveProcess := Processor activeProcess.
+ event sendEventWithFocusOn:focusView.
+ ]
+ ].
+ postEventHook notNil ifTrue:[
+ postEventHook processEvent:event
+ ]
+ ]
+ ].
]
- "Modified: 9.1.1996 / 15:52:30 / cg"
+ "Modified: 1.2.1996 / 22:08:49 / cg"
!
processExposeEvents
@@ -971,23 +971,25 @@
focusView:aViewOrNil
"give focus to aViewOrNil"
+ focusView == aViewOrNil ifTrue:[^ self].
+
focusView notNil ifTrue:[
- "/ lost explicit focus
- focusView == aViewOrNil ifTrue:[^ self].
- focusView showNoFocus:true.
+ "/ lost explicit focus
+ focusView == aViewOrNil ifTrue:[^ self].
+ focusView showNoFocus:true.
] ifFalse:[
- pointerView notNil ifTrue:[
- pointerView ~~ aViewOrNil ifTrue:[
- "/ lost implicit focus
- pointerView showNoFocus:false
- ]
- ].
+ pointerView notNil ifTrue:[
+ pointerView ~~ aViewOrNil ifTrue:[
+ "/ lost implicit focus
+ pointerView showNoFocus:false
+ ]
+ ].
].
focusView := aViewOrNil.
focusView notNil ifTrue:[
- "/ got explicit focus
- focusView showFocus:true.
+ "/ got explicit focus
+ focusView showFocus:true.
].
"
@@ -1000,7 +1002,7 @@
top windowGroup focusView:v1.
"
- "Modified: 27.1.1996 / 13:11:16 / cg"
+ "Modified: 7.2.1996 / 13:02:34 / cg"
! !
!WindowGroup methodsFor:'initialization'!
@@ -1176,6 +1178,6 @@
!WindowGroup class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.64 1996-02-06 20:53:05 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.65 1996-02-07 14:24:46 cg Exp $'
! !
WindowGroup initialize!