ComboView.st
changeset 3755 dca9622d2aa9
parent 3596 cc15fa1bdb45
child 3777 83c52227471d
--- a/ComboView.st	Tue Sep 29 09:59:30 2009 +0200
+++ b/ComboView.st	Tue Sep 29 10:00:20 2009 +0200
@@ -470,7 +470,7 @@
     ].
     field perform:msg ifNotUnderstood:nil.
 
-    (list size == 0) ifTrue:[
+    list isEmptyOrNil ifTrue:[
         msg := #disable
     ].
     pullDownButton perform:msg ifNotUnderstood:nil.
@@ -538,18 +538,19 @@
         ^ false
     ].
 
-    point := Point x:(anEvent x) y:(anEvent y).
+    x := anEvent x.
+    y := anEvent y.
 
     evView ~~ field ifTrue:[
         (evView isSameOrComponentOf:field) ifFalse:[
             ^ false
         ].
+        point := x @ y.
         point := device translatePoint:point fromView:evView toView:field.
+        x := point x.
+        y := point y.
     ].
-    x := point x.
     (x between:0 and:field width) ifFalse:[^ false].
-
-    y := point y.
     (y between:0 and:field height) ifFalse:[^ false].
 
     self pullMenu == false ifTrue:[ ^ false ].
@@ -562,7 +563,6 @@
         ]
     ].
     ^ true
-
 ! !
 
 !ComboView methodsFor:'initialization & release'!
@@ -860,5 +860,5 @@
 !ComboView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.98 2008-11-18 10:51:03 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ComboView.st,v 1.99 2009-09-29 08:00:20 cg Exp $'
 ! !