--- a/MenuPanel.st Mon May 19 15:10:25 2008 +0200
+++ b/MenuPanel.st Mon May 19 15:39:11 2008 +0200
@@ -6832,7 +6832,6 @@
self drawMenuIndicator.
"/ DRAW SHORTCUT KEY
-
( menuItem shortcutKey notNil
and:[(x := menuPanel shortKeyInset) ~~ 0
and:[(scKey:= self shortcutKeyAsString) notNil]]
@@ -6843,31 +6842,30 @@
scKey displayOn:menuPanel x:x y:y.
].
- "/ DRAW SUBMENU INDICATION
-
- (menuPanel isVerticalLayout and:[self hasSubmenu]) ifFalse:[
- ^ self
- ].
- arrow := menuPanel rightArrow.
- x := layout right - arrow width - HorizontalInset.
- y := t + ((h - arrow height) // 2).
-
- (menuPanel styleSheet is3D not
- or:[(drawObject := menuPanel rightArrowShadow) isNil]) ifTrue:[
- ^ menuPanel displayForm:arrow x:x y:y
- ].
- cLa := menuPanel shadowColor.
- cLb := menuPanel lightColor.
-
- isSelected ifFalse:[
- fg := cLa.
- cLa := cLb.
- cLb := fg
- ].
- menuPanel paint:cLa.
- menuPanel displayForm:arrow x:x y:y.
- menuPanel paint:cLb.
- menuPanel displayForm:drawObject x:x y:y.
+ "/ DRAW SUBMENU INDICATION (if a vertical menu with submenu)
+ (menuPanel isVerticalLayout and:[self hasSubmenu]) ifTrue:[
+ arrow := menuPanel rightArrow.
+ x := layout right - arrow width - HorizontalInset.
+ y := t + ((h - arrow height) // 2).
+
+ (menuPanel styleSheet is3D not
+ or:[(drawObject := menuPanel rightArrowShadow) isNil]) ifTrue:[
+ menuPanel displayForm:arrow x:x y:y.
+ ] ifFalse:[
+ cLa := menuPanel shadowColor.
+ cLb := menuPanel lightColor.
+
+ isSelected ifFalse:[
+ fg := cLa.
+ cLa := cLb.
+ cLb := fg
+ ].
+ menuPanel paint:cLa.
+ menuPanel displayForm:arrow x:x y:y.
+ menuPanel paint:cLb.
+ menuPanel displayForm:drawObject x:x y:y.
+ ].
+ ].
"Modified: / 6.9.1998 / 21:48:53 / cg"
!
@@ -7988,7 +7986,7 @@
!MenuPanel class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.464 2008-05-19 13:10:25 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.465 2008-05-19 13:39:11 cg Exp $'
! !
MenuPanel initialize!