MenuPanel.st
changeset 638 2e9b19837590
parent 630 d2c8ddf0fb8f
child 650 29dcdf6a5994
--- a/MenuPanel.st	Fri Jan 02 16:58:59 1998 +0100
+++ b/MenuPanel.st	Fri Jan 02 17:06:32 1998 +0100
@@ -1011,7 +1011,9 @@
             (l := el rawLabel) notNil ifTrue:[
                 (e := l widthOn:self) > x ifTrue:[x := e].
 
-                el hasSubmenu ifTrue:[hasMenu := true].
+                (el hasSubmenu or:[el submenuChannel notNil]) ifTrue:[
+                    hasMenu := true
+                ].
 
                 (     (l := el shortcutKeyAsString) notNil
                  and:[(e := l widthOn:self) > shCtKey]
@@ -2940,7 +2942,7 @@
         (s := self shortcutKeyAsString) notNil ifTrue:[
             x := x + LabelRightOffset + (s widthOn:menuPanel)
         ].
-        (isVertical and:[self hasSubmenu]) ifTrue:[
+        (isVertical and:[self hasSubmenu or:[submenuChannel notNil]]) ifTrue:[
             x := x + menuPanel subMenuIndicationWidth.
 
             s notNil ifTrue:[x := x + ShortcutKeyOffset]
@@ -3151,6 +3153,7 @@
             img := disabledImage.
         ]
     ].
+    t := t + menuPanel level.
     y := t + ((h - (img heightOn:menuPanel)) // 2).
 
     (self textLabel) notNil ifTrue:[
@@ -3791,6 +3794,6 @@
 !MenuPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.39 1997-12-03 15:14:51 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.40 1998-01-02 16:06:32 ca Exp $'
 ! !
 MenuPanel initialize!