hg/stx-libwidg2: comparison MenuPanel.st

equal deleted inserted replaced

-:d8a0fba7b75a
+:732fbaf5864f
 ].
 !
 level:anInt
-super level:anInt.
+anInt ~~ level ifTrue:[
-mustRearrange := true
+super level:anInt.
+mustRearrange := true
+]
 !
 rightArrow
 ^ rightArrow
 !
 !
 fetchDeviceResources
 "fetch device colors, to avoid reallocation at redraw time"
-|bw lvl|
 super fetchDeviceResources.
 "/ thats a kludge - will be replaced by values from the styleSheet ...
 "/ (i.e. read menu.buttonActiveLevel & menu.buttonPassiveLevel)
 onLevel := styleSheet at:#'menu.hilightLevel' default:0.
-self isPopUpView ifTrue:[
-bw  := styleSheet at:#'popup.borderWidth' default:1.
-lvl := styleSheet at:#'popup.level'       default:0.
-] ifFalse:[
-bw  := styleSheet is3D ifFalse:[1] ifTrue:[0].
-].
-self borderWidth:bw.
-self level:lvl.
 superMenu isNil ifTrue:[
 fgColor                   := DefaultForegroundColor         onDevice:device.
 activeBgColor             := DefaultHilightBackgroundColor  onDevice:device.
 activeFgColor             := DefaultHilightForegroundColor  onDevice:device.
 itemSpace        := DefaultItemSpace.
 groupDividerSize := DefaultGroupDividerSize.
 fitFirstPanel    := false.
 font             := MenuView defaultFont onDevice:device.
-super level:(styleSheet is3D ifTrue:[1] ifFalse:[0]).
+self updateLevelAndBorder.
 !
 initialize
 "set default configuration
 "
 shadowView must be realized before self"
 self hiddenOnRealize:true.
 super realize.
 self resize.
 self makeFullyVisible.
+"/        self mustRearrange.
 shadowView notNil ifTrue:[
 shadowView realize.
 ].
 self raise.
 self map.
 "/         self doUngrab:(superMenu isNil)
 "/    ].
 super unmap.
 shadowView notNil ifTrue:[shadowView unmap].
+!
+updateLevelAndBorder
+"update level & border, when it is known if I am a popUpView"
+|bw lvl|
+self isPopUpView ifTrue:[
+bw  := styleSheet at:#'popup.borderWidth' default:1.
+lvl := styleSheet at:#'popup.level'       default:0.
+] ifFalse:[
+bw  := styleSheet is3D ifFalse:[1] ifTrue:[0].
+].
+self borderWidth:bw.
+self level:lvl.
 ! !
 !MenuPanel methodsFor:'keyboard control'!
 mnemonicViewNext:aKeyEvent
 superMenu:aSuperMenu
 "set my supermenu from which i'am activated
 "
 (superMenu := aSuperMenu) notNil ifTrue:[
-super font:(superMenu font)
+super font:(superMenu font).
 ].
 !
 topMenu
 "returns the topMenu; the one having no superMenu
 ! !
 !MenuPanel methodsFor:'queries'!
+container:aView
+super container:aView.
+aView notNil ifTrue:[
+"/ I am no longer a popUpView
+self updateLevelAndBorder
+].
+!
 containsPoint:aPoint
 "returns true if point is contained by the view
 "
 ^ self containsPointX:(aPoint x) y:(aPoint y)
 !
 ActiveHelp isActive ifTrue:[
 hlp := ActiveHelp currentHelpListener.
 hlp initiateHelpFor:self atX:nil y:nil now:true.
 ].
-realized ifTrue:[self rearrangeItems].
+shown "realized" ifTrue:[self rearrangeItems].
 selection selected:true.
 ].
 !
 selectionIndex
 ! !
 !MenuPanel class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.270 2001-09-10 15:09:04 cg Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.271 2001-09-13 14:12:49 cg Exp $'
 ! !
 MenuPanel initialize!

changeset 2003	732fbaf5864f
parent 2000	94bc3e5bba84
child 2004	cf701a027108