--- a/MenuPanel.st Wed Aug 28 17:16:32 2013 +0200
+++ b/MenuPanel.st Thu Aug 29 16:42:12 2013 +0200
@@ -5588,14 +5588,15 @@
!
openDelayed:anItemOrNil afterSeconds:seconds
+ |b|
superMenu notNil ifTrue:[
superMenu openDelayed:anItemOrNil afterSeconds:seconds.
^ self
].
- openDelayedMenuBlock notNil ifTrue:[
- Processor removeTimedBlock:openDelayedMenuBlock.
- openDelayedMenuBlock := nil.
+ (b := openDelayedMenuBlock notNil) ifTrue:[
+ openDelayedMenuBlock := nil.
+ Processor removeTimedBlock:b.
].
(anItemOrNil notNil and:[anItemOrNil hasSubmenu]) ifFalse:[
openDelayedMenuBlock := nil.
@@ -5609,18 +5610,25 @@
].
Processor addTimedBlock:openDelayedMenuBlock afterSeconds:seconds.
+
+ "Modified: / 29-08-2013 / 09:40:28 / cg"
!
selectAndOpenDelayed:anItemOrNil
"change selection to an item or nil"
- |helpListener oldSelect delayedOpenSeconds|
-
- delayedOpenSeconds := self delayInSecondsBeforeOpeningSubmenu.
+ |helpListener oldSelect delayedOpenSeconds b|
anItemOrNil == selection ifTrue:[ ^ self ].
"/ self openDelayed:nil.
+ (b := openDelayedMenuBlock notNil) ifTrue:[
+ openDelayedMenuBlock := nil.
+ Processor removeTimedBlock:b.
+ ].
+
+ delayedOpenSeconds := self delayInSecondsBeforeOpeningSubmenu.
+
oldSelect := selection.
selection := nil.
@@ -5672,6 +5680,8 @@
]
].
].
+
+ "Modified: / 29-08-2013 / 09:44:06 / cg"
!
selection
@@ -8693,11 +8703,11 @@
!MenuPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.567 2013-08-27 15:24:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.568 2013-08-29 14:42:12 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.567 2013-08-27 15:24:18 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.568 2013-08-29 14:42:12 cg Exp $'
! !