# HG changeset patch # User Claus Gittinger # Date 1295559637 -3600 # Node ID d5d971d044ef7a5ff47681aca006001f8c52f3f5 # Parent 51d438d3033cfb3489bc962bb019e5eb36f6a569 changed: #focusView:byTab: focusIn from topView now forces a focusView change in the windowGroup; other \"same-window\" focus events are now ignored in the windowGroup. diff -r 51d438d3033c -r d5d971d044ef WindowGroup.st --- a/WindowGroup.st Thu Jan 20 22:39:16 2011 +0100 +++ b/WindowGroup.st Thu Jan 20 22:40:37 2011 +0100 @@ -2147,7 +2147,8 @@ |prevFocusView myDisplay| -"/ 'focusToView:' print. aViewOrNil printCR. +"/'focusToView:' print. aViewOrNil print. +"/' (prev: ' print. focusView print. ')' printCR. myDisplay := self graphicsDevice. myDisplay notNil ifTrue:[ @@ -2156,7 +2157,7 @@ "/ prevFocusView := myDisplay focusView. prevFocusView ~~ aViewOrNil ifTrue:[ -"/ 'take focus from ' print. prevFocusView printCR. +"/'take focus from ' print. prevFocusView printCR. self class takeFocusFromDevice:myDisplay. ]. ]. @@ -2171,9 +2172,11 @@ focusCameViaTabOrNil notNil ifTrue:[ focusByTab := focusCameViaTabOrNil "or:[focusByTab]". ]. +false ifTrue:[ focusView showFocus:focusByTab. -"/ 'give focus to ' print. aViewOrNil printCR. +'give focus to ' print. aViewOrNil printCR. self class sendKeyboardFocusEventTo:aViewOrNil withArgument:true. +]. ]. ^ self ]. @@ -2181,7 +2184,7 @@ focusView notNil ifTrue:[ "/ lost explicit focus focusView == aViewOrNil ifTrue:[ -"/ 'give focus to ' print. aViewOrNil printCR. +"/'give focus to ' print. aViewOrNil printCR. self class sendKeyboardFocusEventTo:aViewOrNil withArgument:true. ^ self ]. @@ -2191,7 +2194,7 @@ focusView notNil ifTrue:[ "/ got explicit focus aViewOrNil showFocus:(focusCameViaTabOrNil ? true). -"/ 'give focus to ' print. aViewOrNil printCR. +"/'give focus to ' print. aViewOrNil printCR. self class sendKeyboardFocusEventTo:aViewOrNil withArgument:true. focusCameViaTabOrNil notNil ifTrue:[ focusByTab := focusCameViaTabOrNil. @@ -2208,7 +2211,7 @@ top windowGroup focusView:v1. " - "Modified: / 08-11-2006 / 12:17:55 / cg" + "Modified: / 20-01-2011 / 22:39:57 / cg" ! focusViewUnmapped @@ -2720,11 +2723,11 @@ !WindowGroup class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.309 2010-07-28 01:34:59 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.310 2011-01-20 21:40:37 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.309 2010-07-28 01:34:59 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.310 2011-01-20 21:40:37 cg Exp $' ! ! WindowGroup initialize!