hg/stx-libtool: comparison EditFieldWithCompletion.st

equal deleted inserted replaced

-:d2f028e5a546
+:90111a2e7304
+"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 2006 by eXept Software AG
 	      All Rights Reserved
 This software is furnished under a license and may be used
 "{ Package: 'stx:libtool' }"
 "{ NameSpace: Smalltalk }"
 EditField subclass:#EditFieldWithCompletion
-	instanceVariableNames:'showOptions optionsHolder optionsView optionsWindow
+	instanceVariableNames:'showOptions optionsHolder optionsView optionsWindow completionJob
-		focusEventsToIgnore hadFocus completionJob tabCompletionJob'
+		tabCompletionJob'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Views-Text'
 !
 "Modified: / 09-08-2009 / 08:16:41 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 13-02-2010 / 09:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 handleNonCommandKey: char
 super handleNonCommandKey: char.
 self startCompletion
 "Modified: / 26-07-2009 / 17:41:22 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 handlesKeyPress:key inView:aView
 <resource: #keyboard (#CursorDown #CursorUp)>
-^aView == optionsView and:
+^ aView == optionsView and:[(#(CursorDown CursorUp) includes:key) not].
-[(#( #CursorDown #CursorUp ) includes: key) not].
 "Created: / 09-12-2010 / 21:31:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
-hasKeyboardFocus:aBoolean
+hasKeyboardFocus:gotFocusBoolean
-#todo. "/ @jan: please explain what you are doing here...
+hasKeyboardFocus == gotFocusBoolean ifTrue:[
+"no change"
-focusEventsToIgnore > 0 ifTrue:[
+^ self
-focusEventsToIgnore := focusEventsToIgnore - 1.
+].
-"
-xxx == 0 ifTrue:[
+gotFocusBoolean ifTrue:[
-Transcript showCR:'--> taking focus'.
+"position cursor behind of already typed chars"
-self takeFocus.
+self selectAll.
-self assert: self windowGroup focusView == self.
+] ifFalse:[
-hadFocus := true.
+(self hasFocus not and:[optionsWindow notNil and:[optionsWindow hasFocus not]]) ifTrue:[
+self unselect.
+self hideOptionsWindow.
 ].
-"
+].
-^self].
+^ super hasKeyboardFocus:gotFocusBoolean
-hadFocus == aBoolean ifTrue:[
-^self
-].
-aBoolean
-ifTrue:
-[self selectAll]
-ifFalse:
-[self unselect.
-self hideOptionsWindow].
-hadFocus := aBoolean.
-^ super hasKeyboardFocus:aBoolean
 "Created: / 08-08-2009 / 23:28:50 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-08-2009 / 10:14:25 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-12-2010 / 22:05:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 keyPress:key x:x y:y
 "Forward certain events to optionsView if any"
 <resource: #keyboard (#CursorDown #CursorUp #Accept #Return #Escape #BackSpace #Delete)>
+key isCharacter ifTrue:[
+super keyPress:key x:x y:y.
+^ self.
+].
 (optionsView notNil
 and:[#(CursorDown CursorUp) includesIdentical:key]) ifTrue:[
 optionsView keyPress:key x:x y:y.
 ^ self.
 ].
-key == #Accept ifTrue:[self hideOptionsWindow].
+key == #Accept ifTrue:[self hideOptionsWindow; accept].
-key == #Return ifTrue:[self hideOptionsWindow].
+key == #Return ifTrue:[self hideOptionsWindow; accept].
 key == #Escape ifTrue:[self hideOptionsWindow].
 (key == #BackSpace or:[key == #Delete or:[key == #Tab]]) ifTrue:[
 super keyPress:key x:x y:y.
 key == #Tab ifTrue:[
 self startTabCompletion
 self startCompletion.
 ].
 ^ self.
 ].
-super keyPress:key x:x y:y
 "Created: / 08-08-2009 / 22:02:13 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-08-2009 / 14:06:43 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-02-2010 / 20:47:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 keyPress:key x:x y:y view:aView
 self keyPress: key x:x y:y
 "Created: / 09-12-2010 / 21:32:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 ! !
 !EditFieldWithCompletion methodsFor:'initialization & release'!
 destroy
 self hideOptionsWindow.
 super destroy.
 "Created: / 08-08-2009 / 22:16:17 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-08-2009 / 08:50:04 / Jan Vrany <vranyj1@fel.cvut.cz>"
 !
 initialize
 super initialize.
 showOptions := true.
 optionsHolder := ValueHolder new.
-focusEventsToIgnore := 0.
 completionJob := BackgroundJob
 named: 'Edit Field Completion Job'
 on:[self doCompletion].
 tabCompletionJob := BackgroundJob
-named: 'Edit Field Completion Job'
+named: 'Edit Field Tab Completion Job'
 on:[self doTabCompletion].
 "Created: / 08-08-2009 / 20:24:05 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-08-2009 / 08:17:09 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 03-08-2011 / 17:50:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 hideOptionsWindow
 optionsWindow notNil ifTrue:[
 optionsWindow destroy.
-optionsWindow := nil.
+optionsView := optionsWindow := nil.
 ]
 "Created: / 08-08-2009 / 23:23:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-08-2009 / 09:00:00 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 29-11-2011 / 11:27:03 / cg"
 !
 showOptionsWindow
 | x y w |
 showOptions ifFalse:[^ self].
 optionsWindow notNil ifTrue:[
 optionsWindow raise.
 ].
 optionsView := SelectionInListModelView new
 textStartLeft: textStartLeft - 2;
 listHolder: optionsHolder;
-action:[:value | value notNil ifTrue:[ self contents:value asString ] ];
+action:[:value | value notNil ifTrue:[self contents:value asString]];
 doubleClickAction:[:index |
 self contents:(optionsView at:index) asString.
 self hideOptionsWindow.
 self accept
 ];
 optionsWindow := StandardSystemView new
 bePopUpView;
 beSlave;
 origin:x @ y
-extent:(w min: (Screen current width - x)) @ (fontHeight * 10);
+extent:(w min: ((Screen current monitorBoundsAt:(x@y)) corner x - x)) @ (fontHeight * 10);
 yourself.
 ScrollableView
 forView:optionsView
 hasHorizontalScrollBar:false
 miniScrollerV:false
 origin:0.0@0.0
 corner:1.0@1.0
 in:optionsWindow.
-focusEventsToIgnore := 4.
 optionsWindow open.
 "Created: / 09-08-2009 / 08:12:21 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 09-08-2009 / 09:28:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
 "Modified: / 29-11-2011 / 11:27:13 / cg"

changeset 16728	90111a2e7304
parent 16715	78d44ccf2a1c
child 16729	087537207973
child 16982	4a80412feb9a