hg/stx-libwidg: comparison MenuView.st

equal deleted inserted replaced

-:3ee5ea99d0e2
+:59758ff5b841
 SelectionInListView subclass:#MenuView
 instanceVariableNames:'selectors args receiver enableFlags
 			      disabledFgColor onOffFlags subMenus
 			      subMenuShown superMenu checkColor
-			      lineLevel lineInset masterView hilightStyle'
+			      lineLevel lineInset masterView hilightStyle
+			      needResize'
 classVariableNames:'DefaultFont DefaultCheckColor DefaultViewBackground
 			   DefaultForegroundColor
 			   DefaultBackgroundColor
 			   DefaultDisabledForegroundColor
 			   DefaultHilightForegroundColor
 MenuView comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
-$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.23 1995-04-02 11:43:25 claus Exp $
+$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.24 1995-05-03 00:36:19 claus Exp $
 '!
 !MenuView class methodsFor:'documentation'!
 copyright
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.23 1995-04-02 11:43:25 claus Exp $
+$Header: /cvs/stx/stx/libwidg/MenuView.st,v 1.24 1995-05-03 00:36:19 claus Exp $
 "
 !
 documentation
 "
 1) action:aBlockWithOneArg
 which defines a block to be called with the line number (1..n)
 of the selected line.
-2) selectors:selectorArray [args: argarray] receiver:anObject
+2) selectors:selectorArray [args: argArray] [receiver:anObject]
-which defines the messages to be sent to receiver for each
+which defines the messages to be sent to the model or
-line.
+receiver. Giving an explicit receiver overrides the model.
 It is also possible to define both actionBlock and selectorArray.
 The wellknown popups are created by wrapping a MenuView into an instance of
 PopUpMenu (read the description of popupmenu).
 labels:labels selectors:selArray args:argArray receiver:anObject in:aView
 "create and return a new MenuView in aView
 - receiverObject gets message from selectorArray with argument
 from argArray"
-^ (self in:aView) labels:labels
+^ (self in:aView)
-		   selectors:selArray
+	labels:labels
-			args:argArray
+	selectors:selArray
-		    receiver:anObject
+	args:argArray
+	receiver:anObject
 !
 labels:labels selectors:selArray receiver:anObject in:aView
 "create and return a new MenuView in aView
 - receiverObject gets message from selectorArray without argument"
-^ (self in:aView) labels:labels
+^ self labels:labels selectors:selArray args:nil receiver:anObject in:aView
-		   selectors:selArray
-			args:nil
-		    receiver:anObject
 !
 labels:labels selector:aSelector args:argArray receiver:anObject in:aTopMenu
 "create and return a new MenuView
 - receiverObject gets message aSelector with argument from
 argArray for all entries"
-^ (self in:aTopMenu) labels:labels
+"OBSOLETE protocol: labels:selectors:args:receiver: knows how to handle a
-		      selectors:aSelector
+single symbol-arg for selectors ..."
-			   args:argArray
-		       receiver:anObject
+^ self labels:labels selectors:aSelector args:argArray receiver:anObject
+!
+labels:labels selectors:selArray args:argArray receiver:anObject for:aTopMenu
+"create and return a new MenuView for a topMenu"
+^ self labels:labels selectors:selArray args:argArray receiver:anObject in:(aTopMenu superView)
 !
 labels:labels selector:aSelector args:argArray receiver:anObject for:aTopMenu
 "create and return a new MenuView
 - receiverObject gets message aSelector with argument from
-argArray for all entries"
+argArray for ALL entries"
-^ (self in:(aTopMenu superView)) labels:labels
+"OBSOLETE protocol: labels:selectors:args:receiver: knows how to handle a
-				  selectors:aSelector
+single symbol-arg for selectors ..."
-				       args:argArray
-				   receiver:anObject
+^ self labels:labels selectors:aSelector args:argArray receiver:anObject in:(aTopMenu superView)
-!
-labels:labels selectors:selArray args:argArray receiver:anObject for:aTopMenu
-^ (self in:(aTopMenu superView)) labels:labels
-				  selectors:selArray
-				       args:argArray
-				   receiver:anObject
 !
 labels:labels selectors:selArray receiver:anObject for:aTopMenu
-^ (self in:(aTopMenu superView)) labels:labels
+^ self labels:labels selectors:selArray args:nil receiver:anObject for:aTopMenu
-				  selectors:selArray
+!
-				       args:nil
-				   receiver:anObject
+labels:labels selectors:selArray args:argArray receiver:anObject
+"create and return a new MenuView. The parent view
+should be set later."
+^ (self new)
+	labels:labels
+	selectors:selArray
+	args:argArray
+	receiver:anObject
+!
+labels:labels selectors:selArray args:argArray
+"create and return a new MenuView. The parent view
+should be set later."
+^ self labels:labels selectors:selArray args:argArray
 !
 labels:labels selectors:selArray receiver:anObject
 "create and return a new MenuView. The parent view
 should be set later."
-^ (self new) labels:labels
+^ self labels:labels selectors:selArray args:nil receiver:anObject
-		   selectors:selArray
-			args:nil
-		    receiver:anObject
 !
 labels:labels selectors:selArray
 "create and return a new MenuView. The parent veiw
 and receiver should be set later."
-^ (self new) labels:labels
+^ self labels:labels selectors:selArray args:nil receiver:nil
-		   selectors:selArray
-			args:nil
-		    receiver:nil
 !
 labels:labels
 "create and return a new MenuView. The parent view,
 selectors and receiver should be set later."
-^ (self new) labels:labels
+^ self labels:labels selectors:nil args:nil receiver:nil
-		   selectors:nil
-			args:nil
-		    receiver:nil
 ! !
 !MenuView methodsFor:'initialize / release'!
 initialize
 selection := nil. "self selection:nil."
 self cursor:Cursor hand
 !
 initStyle
+|style|
 super initStyle.
 DefaultFont notNil ifTrue:[
 	font := DefaultFont on:device
 ].
 DefaultCheckColor notNil ifTrue:[
 	checkColor := DefaultCheckColor
 ] ifFalse:[
 	checkColor := fgColor.
 ].
-DefaultDisabledForegroundColor notNil ifTrue:[
+disabledFgColor := DefaultDisabledForegroundColor on:device.
-	disabledFgColor := DefaultDisabledForegroundColor
-] ifFalse:[
-	disabledFgColor := Color darkGrey
-].
-disabledFgColor := disabledFgColor on:device.
 DefaultForegroundColor notNil ifTrue:[
 	fgColor := DefaultForegroundColor on:device
 ].
 DefaultBackgroundColor notNil ifTrue:[
 "
 the following has to be changed to
 use the styleSheet too
 "
+style := StyleSheet name.
 (style ~~ #normal) ifTrue:[
 	"the inset on each side"
 	style == #motif ifTrue:[
 	    lineInset := 0
 	] ifFalse:[
 !
 create
 super create.
 subMenuShown := nil.
-self recomputeSize
+self resizeIfChanged
+"/    self recomputeSize
 !
 recreate
 super recreate.
 hilightStyle == #openwin ifTrue:[
 text keysAndValuesDo:[:index :line |
 	(line notNil and:[line includes:$\ ]) ifTrue:[
 	    onOffFlags at:index put:false
 	].
 ].
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 !
 labelAt:indexOrName put:aString
 "change the label at index to be aString"
 		onOffFlags := onOffFlags copyWith:nil
 	    ]
 	].
 	onOffFlags at:i put:false
 ].
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 !
 font:aFont
 "adjust size for new font"
 super font:(aFont on:device).
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 !
 addSeparatingLine
 "add a separating line"
 ] ifFalse:[
 	list := list copyWith:aLabel
 ].
 selectors := selectors copyWith:aSelector.
 enableFlags := enableFlags copyWith:true.
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 !
 addLabel:aLabel selector:aSelector arg:anArg
 "add another label/selector/argument trio"
 	list := list copyWith:aLabel
 ].
 selectors := selectors copyWith:aSelector.
 args := args copyWith:anArg.
 enableFlags := enableFlags copyWith:true.
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 !
 addLabel:aLabel selector:aSelector after:aLabelOrSelectorOrNumber
 "insert another label/selector pair at some place.
 Being very friendly here, allowing label-string, selector or numeric
 |v1 v2 v3 v4|
 v1 := CodeView new realize.
 v2 := CodeView new realize.
-v2 middleButtonMenu menuView addLabel:'new entry' selector:#foo after:'paste'.
+v2 middleButtonMenu:
+	v editMenu addLabel:'new entry' selector:#foo after:'paste'.
 v3 := CodeView new realize.
-v3 middleButtonMenu menuView addLabel:'new entry' selector:#foo after:#others.
+v3 middleButtonMenu:
+	v editMenu addLabel:'new entry' selector:#foo after:#others.
 v4 := CodeView new realize.
-v4 middleButtonMenu menuView addLabel:'new entry' selector:#foo after:1.
+v4 middleButtonMenu:
+	v editMenu addLabel:'new entry' selector:#foo after:1.
+"
+!
+addLabels:moreLabels selectors:moreSelectors after:aLabelOrSelectorOrNumber
+"insert more labels/selectors at some place.
+Being very friendly here, allowing label-string, selector or numeric
+index for the argument aLabelOrSelectorOrNumber.
+To be independent of the entries label, we recommend you use the selector
+as index; in systems which translate strings for national variants,
+this makes your code easier to maintain."
+^ self addLabels:moreLabels
+	   selectors:moreSelectors
+	      before:(self indexOf:aLabelOrSelectorOrNumber) + 1
+!
+addLabels:moreLabels selectors:moreSelectors before:aLabelOrSelectorOrNumber
+"insert more labels/selectors at some place.
+Being very friendly here, allowing label-string, selector or numeric
+index for the argument aLabelOrSelectorOrNumber.
+To be independent of the entries label, we recommend you use the selector
+as index; in systems which translate strings for national variants,
+this makes your code easier to maintain."
+|idx
+i     "{ Class: SmallInteger }"
+nMore "{ Class: SmallInteger }"|
+list isNil ifTrue:[
+	^ self addLabels:moreLabels selectors:moreSelectors
+].
+"
+be user friendly - allow both label or selector
+to be passed
+"
+idx := self indexOf:aLabelOrSelectorOrNumber.
+(idx between:1 and:list size) ifFalse:[
+	"add to end"
+	^ self addLabels:moreLabels selectors:moreSelectors
+].
+nMore := moreLabels size.
+"/ just a check
+moreSelectors size ~~ nMore ifTrue:[
+	^ self error
+].
+list := list asOrderedCollection.
+i := idx.
+moreLabels do:[:aLabel |
+	list add:aLabel beforeIndex:i. i := i + 1.
+].
+selectors := selectors asOrderedCollection.
+i := idx.
+moreSelectors do:[:sel |
+	selectors add:sel beforeIndex:i. i := i + 1.
+].
+enableFlags := enableFlags asOrderedCollection.
+i := idx.
+nMore timesRepeat:[
+	enableFlags add:true beforeIndex:i. i := i + 1.
+].
+subMenus notNil ifTrue:[
+	subMenus := subMenus asOrderedCollection.
+	i := idx.
+	nMore timesRepeat:[
+	    subMenus add:nil beforeIndex:i. i := i + 1.
+	].
+].
+args notNil ifTrue:[
+	args := args asOrderedCollection.
+	i := idx.
+	nMore timesRepeat:[
+	    args add:nil beforeIndex:i. i := i + 1.
+	]
+].
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
+"
+|v1 v2 v3 v4 m|
+v1 := CodeView new realize.
+v2 := CodeView new realize.
+m := v2 editMenu.
+m
+	addLabels:#('new entry1' 'new entry2')
+	selectors:#(foo bar)
+	before:'paste'.
+v2 middleButtonMenu:m.
+v3 := CodeView new realize.
+m := v3 editMenu.
+m
+	addLabels:#('new entry1' 'new entry2')
+	selectors:#(foo bar)
+	before:#again.
+v3 middleButtonMenu:m.
+v4 := CodeView new realize.
+m := v4 editMenu.
+m
+	addLabels:#('new entry1' 'new entry2')
+	selectors:#(foo bar)
+	before:1.
+v4 middleButtonMenu:m.
 "
 !
 addLabel:aLabel selector:aSelector before:aLabelOrSelectorOrNumber
 "insert another label/selector pair at some place.
 ].
 args notNil ifTrue:[
 	args := args asOrderedCollection.
 	args add:nil beforeIndex:idx.
 ].
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 "
 |v1 v2 v3 v4|
 v1 := CodeView new realize.
 v2 := CodeView new realize.
-v2 middleButtonMenu menuView addLabel:'new entry' selector:#foo before:'paste'.
+v2 middleButtonMenu:
+	(v2 editMenu) addLabel:'new entry' selector:#foo before:'paste'.
 v3 := CodeView new realize.
-v3 middleButtonMenu menuView addLabel:'new entry' selector:#foo before:#again.
+v3 middleButtonMenu:
+	(v3 editMenu) addLabel:'new entry' selector:#foo before:#again.
 v4 := CodeView new realize.
-v4 middleButtonMenu menuView addLabel:'new entry' selector:#foo before:1.
+v4 middleButtonMenu:
+	(v4 editMenu) addLabel:'new entry' selector:#foo before:1.
 "
 !
 remove:indexOrName
 "remove the label at index"
 selectors := selectors asOrderedCollection removeIndex:i.
 enableFlags := enableFlags asOrderedCollection removeIndex:i.
 subMenus notNil ifTrue:[
 	subMenus := subMenus asOrderedCollection removeIndex:i.
 ].
-self recomputeSize
+shown ifTrue:[
+	self recomputeSize
+] ifFalse:[
+	needResize := true
+]
 !
 indexOf:indexOrName
 "return the index of the label named:aName or , if its a symbol
 the index in the selector list"
 "return the receiver of the message"
 ^ receiver
 !
+checkFlags
+"return an array filled with the check-mark flags.
+Non check-menu items have a nil entry in this array."
+^ onOffFlags
+!
 selectors
 "return the selector array"
 ^ selectors
 !
 	newSubMenus := Array new:(list size max:i).
 	subMenus notNil ifTrue:[
 	    newSubMenus replaceFrom:1 with:subMenus.
 	].
 	subMenus := newSubMenus.
-	self recomputeSize
+	shown ifTrue:[
+	    self recomputeSize
+	] ifFalse:[
+	    needResize := true
+	]
 ].
 subMenus at:i put:aPopUpMenu
 !
 selection:index
 	subMenuShown hide.
 	subMenuShown := nil
 ].
 !
+resizeIfChanged
+needResize == true ifTrue:[
+	self recomputeSize.
+	needResize := false
+]
+!
 recomputeSize
 |margin2 w h|
+widthOfWidestLine := nil.  "/ i.e. unknown
 margin2 := margin * 2.
 w := self widthOfContents + leftMargin + leftMargin + margin2.
 h := (self numberOfLines) * fontHeight + (2 * topMargin) + margin2.
 "if there is a submenu, add some space for the right arrow"
 	windowGroup addTopView:m.
 ].
 m fixSize.
 m origin:org.
 m makeFullyVisible.
+m noShadow.
 m realize.
 device synchronizeOutput.
 subMenuShown := m
 !
 ]
 ! !
 !MenuView methodsFor:'showing'!
+realize
+needResize == true ifTrue:[
+	self recomputeSize
+].
+super realize
+!
 show
 hidden := false.
-super realize
+self realize
 ! !
 !MenuView methodsFor:'selections'!
 isValidSelection:aNumber

changeset 119	59758ff5b841
parent 115	57c0ee9a56c0
child 126	40228f4fd66b