PullDownMenu.st
changeset 116 be0971c081e2
parent 115 57c0ee9a56c0
child 119 59758ff5b841
--- a/PullDownMenu.st	Sun Apr 02 13:43:38 1995 +0200
+++ b/PullDownMenu.st	Tue Apr 11 18:24:40 1995 +0200
@@ -33,7 +33,7 @@
 COPYRIGHT (c) 1989 by Claus Gittinger
 	     All Rights Reserved
 
-$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.15 1995-04-02 11:43:38 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.16 1995-04-11 16:24:06 claus Exp $
 '!
 
 !PullDownMenu class methodsFor:'documentation'!
@@ -54,7 +54,7 @@
 
 version
 "
-$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.15 1995-04-02 11:43:38 claus Exp $
+$Header: /cvs/stx/stx/libwidg/PullDownMenu.st,v 1.16 1995-04-11 16:24:06 claus Exp $
 "
 !
 
@@ -913,10 +913,14 @@
 buttonMotion:button x:x y:y
     |titleIndex activeMenu activeLeft activeTop|
 
+    activeMenuNumber notNil ifTrue:[
+	activeMenu := menus at:activeMenuNumber.
+    ].
+
     (y < height) ifTrue:[
 	"moving around in title line"
-	activeMenuNumber notNil ifTrue:[
-	    (menus at:activeMenuNumber) selection:nil
+	activeMenu notNil ifTrue:[
+	    activeMenu selection:nil
 	].
 	titleIndex := self titleIndexForX:x.
 	titleIndex notNil ifTrue:[
@@ -926,8 +930,7 @@
 	]
     ] ifFalse:[
 	"moving around below"
-	activeMenuNumber isNil ifTrue:[^self].
-	activeMenu := menus at:activeMenuNumber.
+	activeMenu isNil ifTrue:[^self].
 	activeLeft := activeMenu left.
 	(x between:activeLeft and:(activeMenu right)) ifTrue:[
 	    activeTop := activeMenu top.