hg/stx-libwidg2: comparison MenuPanel.st

equal deleted inserted replaced

-:72cda227e48d
+:c72f35819bda
 !
 Object subclass:#Item
 	instanceVariableNames:'menuItem layout menuPanel subMenu rawLabel rawLabelExtent
 		disabledRawLabel enableChannel label activeHelpText flyByHelpText
-		submenuChannel isVisible indication choice accessCharacter font'
+		isVisible indication choice accessCharacter font'
 	classVariableNames:'HorizontalInset VerticalInset HorizontalButtonInset
 		VerticalButtonInset LabelRightOffset VerticalPopUpInset'
 	poolDictionaries:''
 	privateIn:MenuPanel
 !
 ] ifFalse:[
 "/ use font from menupanel
 font := nil
 ].
-rawLabel isEmptyOrNil ifFalse:[
+rawLabel isString ifTrue:[
 "have to recompute the extent"
 self label:label
 ]
 ].
 !
 subMenu menu:aSubMenu.
 ] ifFalse:[
 aSubMenu isView ifFalse:[
 (aSubMenu isKindOf:ApplicationModel) ifFalse:[
 "/ ... mhhhh ....
-^ self submenuChannel:aSubMenu
+^ menuItem submenuChannel:aSubMenu
 ].
 widget := SimpleView new.
 widget client:aSubMenu.
 ] ifTrue:[
 widget := aSubMenu
 subMenu extent:(widget preferredExtent).
 widget origin:0.0@0.0 corner:1.0@1.0.
 ].
 subMenu superMenu:menuPanel.
 ].
-menuItem keepLinkedMenu ifTrue:[
-submenuChannel := nil
-]
 !
 textLabel
 "returns my textLabel or nil if none text
 "
 enabled
 "returns the enabled state
 "
 |state|
-menuPanel enabled ifTrue:[
+menuPanel enabled ifFalse:[^ false].
-	enableChannel isSymbol ifTrue:[
-	    state := self aspectAt:enableChannel.
+enableChannel isSymbol ifTrue:[
-	    state isNil ifTrue:[
+state := self aspectAt:enableChannel.
-		self ifNotInUIBuilderInfoPrintCR:
-		    ('MenuPanel::Item [info]: no aspect for ', enableChannel, ' (in ' , (label?rawLabel) printString , ')')
+state isNil ifTrue:[
-	    ] ifFalse:[
+self ifNotInUIBuilderInfoPrintCR:
-		state isValueModel ifTrue:[
+('MenuPanel::Item [info]: no aspect for ', enableChannel, ' (in ' , label printString , ')').
-		    enableChannel := state.
+^ true
-		    enableChannel addDependent:self.
+].
-		    state := enableChannel value.
-		] ifFalse:[
+state isValueModel ifTrue:[
-		    state := state value
+enableChannel := state.
-		]
+enableChannel addDependent:self.
-	    ]
+state := enableChannel value.
-	] ifFalse:[
+] ifFalse:[
-	    state := enableChannel value
+state := state value
-	].
+]
-^ state ~~ false
+] ifFalse:[
-].
+state := enableChannel value
-^ false
+].
+^ state ~~ false
 !
 enabled:something
 "change the enabled state; if the state changed, a redraw is performed
 "
 !
 submenuChannel
 "get the submenu channel
 "
-^ submenuChannel
+^ menuItem submenuChannel
 !
 submenuChannel:aSelectorOrNil
 "returns the submenu channel
 "
-submenuChannel := aSelectorOrNil.
+menuItem submenuChannel:aSelectorOrNil.
 ! !
 !MenuPanel::Item methodsFor:'accessing-dimension'!
 moveBy:aPoint
 |id|
 aSubmenu ifNil:[^ self].
 aSubmenu realized ifFalse:[
-	id := aSubmenu id.
+id := aSubmenu id.
-	id ifNotNil:[ menuPanel device unmapWindow:id ]
+id ifNotNil:[ menuPanel device unmapWindow:id ]
 ] ifTrue:[
-	aSubmenu hide
+aSubmenu hide
 ].
 aSubmenu  windowGroup:nil.
 menuPanel windowGroup removeView:aSubmenu.
 "/ release menu if derived from channel
-submenuChannel notNil ifTrue:[
+(subMenu == aSubmenu and:[menuItem submenuChannel notNil]) ifTrue:[
-	subMenu == aSubmenu ifTrue:[
+menuItem keepLinkedMenu ifFalse:[
-	    subMenu := nil
+subMenu := nil
-	]
+]
 ].
 !
 openDelayedSubmenu
 "called to open now my delayed submenu
 "/ but ... ??
 (lbl := menuItem labelImage value) isNil ifTrue:[
 lbl := menuItem rawLabel. "/ avoid translating &'s twice
 ].
+self submenu:(menuItem submenu).
 self label:lbl.
-submenuChannel := menuItem submenuChannel.
-self submenu:(menuItem submenu).
 ]
 "Modified: / 22.8.1998 / 15:34:16 / cg"
 ! !
 |subm sel numArgs|
 aRecv isNil ifTrue:[^ nil].
-sel := submenuChannel asSymbol.
+sel := menuItem submenuChannel.
+sel isString ifFalse:[^ nil].
+sel := sel asSymbol.
 numArgs := sel numArgs.
 numArgs == 0 ifTrue:[
 MessageNotUnderstood handle:[:ex |
 |selector|
 ].
 ^ #blankLine
 !
 setupSubmenu
-|appl master recv submenuHolder submenu submenuEncoding|
+|appl master recv submenuHolder submenu submenuEncoding channel|
-submenuChannel notNil ifTrue:[
+channel := menuItem submenuChannel value.
-submenuChannel isSymbol ifFalse:[
+channel isNil ifTrue:[ ^ subMenu ].
-submenuHolder := submenuChannel
-] ifTrue:[
+subMenu notNil ifTrue:[
-appl := menuPanel application.
+menuItem keepLinkedMenu ifTrue:[ ^ subMenu ].
-appl isNil ifTrue:[
+].
-appl := menuPanel receiver.
-appl notNil ifTrue:[
+channel isSymbol ifFalse:[
-(submenuHolder := self findSubMenuIn:appl) isNil ifTrue:[
+submenuHolder := channel
-[submenuHolder isNil
+] ifTrue:[
-and:[(master := appl perform:#masterApplication ifNotUnderstood:nil) notNil
+appl := menuPanel application.
-and:[master ~~ appl]]] whileTrue:[
+appl isNil ifTrue:[
-appl := master.
+appl := menuPanel receiver.
-submenuHolder := self findSubMenuIn:appl.
+appl notNil ifTrue:[
-].
+(submenuHolder := self findSubMenuIn:appl) isNil ifTrue:[
-]
+[submenuHolder isNil
-].
+and:[(master := appl perform:#masterApplication ifNotUnderstood:nil) notNil
+and:[master ~~ appl]]] whileTrue:[
+appl := master.
+submenuHolder := self findSubMenuIn:appl.
+].
+]
 ].
-submenuHolder isNil ifTrue:[
+].
-(submenuHolder := self findSubMenuIn:appl) isNil ifTrue:[
+submenuHolder isNil ifTrue:[
-(recv := menuPanel receiver) ~~ appl ifTrue:[
+(submenuHolder := self findSubMenuIn:appl) isNil ifTrue:[
-appl := recv.
+(recv := menuPanel receiver) ~~ appl ifTrue:[
-submenuHolder := self findSubMenuIn:appl
+appl := recv.
-]
+submenuHolder := self findSubMenuIn:appl
 ]
 ]
+]
+].
+(submenu := submenuHolder value) isArray ifTrue:[
+submenuEncoding := submenu.
+submenu := Menu new fromLiteralArrayEncoding:submenuEncoding.
+"/ cg: linked menus also may contain translations ...
+submenu notNil ifTrue:[
+appl notNil ifTrue:[
+submenu findGuiResourcesIn:appl.
+]
 ].
+].
-(submenu := submenuHolder value) isArray ifTrue:[
+"/ appl notNil ifTrue:[submenu application:appl].
-submenuEncoding := submenu.
+self submenu:submenu.
-submenu := Menu new fromLiteralArrayEncoding:submenuEncoding.
-"/ cg: linked menus also may contain translations ...
-submenu notNil ifTrue:[
-appl notNil ifTrue:[
-submenu findGuiResourcesIn:appl.
-]
-].
-].
-"/ appl notNil ifTrue:[submenu application:appl].
-self submenu:submenu.
-].
 ^ subMenu
 "Modified: / 19.5.1998 / 19:36:56 / cg"
 ! !
 !
 hasSubmenu
 "returns true if the item is configured as an subMenu entry
 "
-^ subMenu notNil or:[submenuChannel notNil]
+^ subMenu notNil or:[menuItem submenuChannel notNil]
 !
 isEnabled
 "returns enabled state
 "
 ! !
 !MenuPanel class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.352 2002-11-08 15:32:20 ca Exp $'
+^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.353 2002-11-11 10:29:41 ca Exp $'
 ! !
 MenuPanel initialize!

changeset 2364	c72f35819bda
parent 2362	7a0f2e986289
child 2372	d136f6d4b7c5