focus handling changed.
authorClaus Gittinger <cg@exept.de>
Sun, 14 Mar 1999 14:06:59 +0100
changeset 1792 2ce7e48e00d4
parent 1791 7d0305e6cee3
child 1793 769bcc27886b
focus handling changed.
ETxtView.st
EditField.st
EditTextView.st
ListView.st
--- a/ETxtView.st	Sun Mar 14 14:05:06 1999 +0100
+++ b/ETxtView.st	Sun Mar 14 14:06:59 1999 +0100
@@ -3362,29 +3362,14 @@
 !
 
 pointerEnter:state x:x y:y
-    self requestFocus ifTrue:[
-"/        (windowGroup isNil 
-"/        or:[windowGroup focusView isNil
-"/        or:[windowGroup focusView == self]]) ifTrue:[
-"/            self hasKeyboardFocus:true
-"/        ].
-    ].
+    "mouse pointer entered - request the keyboard focus"
+
+    self requestFocus.
     super pointerEnter:state x:x y:y
 
     "Modified: 11.12.1996 / 16:56:30 / cg"
 !
 
-pointerLeave:state
-"/    (windowGroup isNil 
-"/    or:[windowGroup focusView isNil
-"/    or:[windowGroup focusView ~~ self]]) ifTrue:[
-"/        self hasKeyboardFocus:false
-"/    ].
-    super pointerLeave:state
-
-    "Modified: 11.12.1996 / 16:56:43 / cg"
-!
-
 showFocus:explicit
     "in addition to however my superclass thinks how a focusView is to be
      displayed, show the cursor when I got the focus"
@@ -4513,5 +4498,5 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.186 1999-03-14 13:05:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ETxtView.st,v 1.187 1999-03-14 13:05:47 cg Exp $'
 ! !
--- a/EditField.st	Sun Mar 14 14:05:06 1999 +0100
+++ b/EditField.st	Sun Mar 14 14:06:59 1999 +0100
@@ -1423,21 +1423,6 @@
     "Modified: 16.12.1995 / 16:36:13 / cg"
 !
 
-focusIn
-    "got the explicit focus"
-
-"/    enabled ifFalse:[
-"/        enabled := true.
-"/        super focusIn.
-"/        enableAction notNil ifTrue:[
-"/            enableAction value
-"/        ]
-"/    ] ifTrue:[
-"/        super focusIn
-"/    ].
-    ^ super focusIn
-!
-
 hasKeyboardFocus:aBoolean
     aBoolean ifFalse:[
         acceptOnLostFocus ifTrue:[
@@ -1652,12 +1637,12 @@
 !
 
 showFocus:explicit
-    "/ giving me the focus is loke clicking on me
-    "/ (tell my enterFieldGroup ....
+    "/ giving me the focus is like clicking on me
+    "/ (tell my enterFieldGroup ...)
+
 
     (enabled or:[explicit]) ifTrue:[
         clickAction notNil ifTrue:[clickAction value:self].
-        self showCursor.
         super showFocus:explicit
     ]
 
@@ -1766,7 +1751,7 @@
     selectionBgColor := DefaultSelectionBackgroundColor.
 
     "/ enable this, when the focus detection works correctly (in dialogs)
-    "/ cursorTypeNoFocus := #none
+    cursorTypeNoFocus := #none
 
     "Modified: / 21.5.1998 / 15:38:14 / cg"
 !
@@ -2034,5 +2019,5 @@
 !EditField class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.117 1999-03-09 23:56:04 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditField.st,v 1.118 1999-03-14 13:06:29 cg Exp $'
 ! !
--- a/EditTextView.st	Sun Mar 14 14:05:06 1999 +0100
+++ b/EditTextView.st	Sun Mar 14 14:06:59 1999 +0100
@@ -3362,29 +3362,14 @@
 !
 
 pointerEnter:state x:x y:y
-    self requestFocus ifTrue:[
-"/        (windowGroup isNil 
-"/        or:[windowGroup focusView isNil
-"/        or:[windowGroup focusView == self]]) ifTrue:[
-"/            self hasKeyboardFocus:true
-"/        ].
-    ].
+    "mouse pointer entered - request the keyboard focus"
+
+    self requestFocus.
     super pointerEnter:state x:x y:y
 
     "Modified: 11.12.1996 / 16:56:30 / cg"
 !
 
-pointerLeave:state
-"/    (windowGroup isNil 
-"/    or:[windowGroup focusView isNil
-"/    or:[windowGroup focusView ~~ self]]) ifTrue:[
-"/        self hasKeyboardFocus:false
-"/    ].
-    super pointerLeave:state
-
-    "Modified: 11.12.1996 / 16:56:43 / cg"
-!
-
 showFocus:explicit
     "in addition to however my superclass thinks how a focusView is to be
      displayed, show the cursor when I got the focus"
@@ -4513,5 +4498,5 @@
 !EditTextView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.186 1999-03-14 13:05:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EditTextView.st,v 1.187 1999-03-14 13:05:47 cg Exp $'
 ! !
--- a/ListView.st	Sun Mar 14 14:05:06 1999 +0100
+++ b/ListView.st	Sun Mar 14 14:06:59 1999 +0100
@@ -1621,6 +1621,10 @@
 
     "Modified: / 18.11.1996 / 19:37:02 / stefan"
     "Modified: / 27.1.1998 / 14:10:04 / cg"
+!
+
+wantsFocusWithButtonPress
+    ^  true
 ! !
 
 !ListView methodsFor:'initialization'!
@@ -3868,5 +3872,5 @@
 !ListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.189 1999-03-08 13:09:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.190 1999-03-14 13:06:59 cg Exp $'
 ! !