hg/stx-libtool2: comparison UIPainter.st

equal deleted inserted replaced

-:8734833de8fe
+:db8d30e7a621
 code readStream fileIn.
 ].
 UserPreferences current systemBrowserClass openInClass:cls selector:aspect
 !
-doBrowseAspectClass:aspectSelector
-"browse the class as entered in the field (can be called by buttons in a subspec)"
-self doBrowseAspectClassAndSelector:{ aspectSelector . nil }
-!
-doBrowseAspectClassAndSelector:classAndSelectorPair
-"browse the class as entered in the field (can be called by buttons in a subspec)"
-|spec classAspect selectorAspect className selector class |
-classAspect := classAndSelectorPair first.
-selectorAspect := classAndSelectorPair second.
-"/ wrong: the code below uses the spec's aspect values;
-"/ but the spec is only valid after accepting.
-"/    spec := painter specForSelection.
-"/    spec isNil ifTrue:[^ self].
-"/    className := spec perform:classAspect.
-"/
-"/    selectorAspect notNil ifTrue:[
-"/        selector := spec perform:selectorAspect.
-"/    ].
-"/ we have to take the current value from the widget's value,
-"/ which is in the listOfAspects!!
-className := (specTool aspectFor:classAspect) value.
-selector := (specTool aspectFor:selectorAspect) value.
-(className isEmptyOrNil or:[(selectorAspect notNil and:[selector isEmptyOrNil])]) ifTrue:[
-Dialog information:(resources
-string:'Class and/or selector missing (for "%1 / %2")'
-with:classAspect with:selectorAspect).
-^ self
-].
-class := Smalltalk classNamed:className.
-class isBehavior ifFalse:[
-Dialog information:(resources
-string:'"%1" does not refer to a valid class (in "%2")'
-with:className with:classAspect).
-^ self
-].
-UserPreferences current systemBrowserClass openInClass:class selector:selector
-!
 doBrowseAspectMethod:aspectSelector
 "browse or create the aspect method as entered in the field (button beside input fieled pressed)"
 self isModified ifTrue:[ self accept ].
 "/ self acceptOrIgnoreSectionModification.
 "Created: / 16-01-2008 / 17:49:20 / cg"
 ! !
 !UIPainter::TreeView class methodsFor:'documentation'!
-erarchy"
+documentation
+"
-treeView doStepOver:-1
+selection in tree view; only used by the UIPainter
-! !
+[see also:]
-!UIPainter::TreeView methodsFor:'accessing'!
+SelectionInTreeView
+SelectionInTree
-ditToolbar
+TreeItem
-self editToolBarVisibleHolder value:false
-!
-BarVisibleHolder value:false
-!
-Spec newSpec|
-(aSpecOrWidgetClass isSubclassOf:UISpecification) ifTrue:[
-newSpecClass := aSpecOrWidgetClass.
-] ifFalse:[
-(aSpecOrWidgetClass isSubclassOf:View) ifTrue:[
-newSpecClass := aSpecOrWidgetClass basicNew specClass.
-] ifFalse:[
-newSpecClass := nil
-].
-].
-newSpecClass isNil ifTrue:[
-Dialog warn:'Invalid Spec- or View-Class: ' , aSpecOrWidgetClass name.
-^ self.
-].
-treeView isCanvasSelected ifTrue:[
-^ self
-].
-oldSpec := self selectedSpec.
-newSpec := newSpecClass cloneFrom:oldSpec.
-self painter replaceSelectionBy:newSpec.
-"Modified: / 05-09-2012 / 19:24:40 / cg"
-!
-og warn:'Invalid Spec- or View-Class: ' , aSpecOrWidgetClass name.
-^ self.
-].
-treeView isCanvasSelected ifTrue:[
-^ self
-].
-oldSpec := self selectedSpec.
-newSpec := newSpecClass cloneFrom:oldSpec.
-self painter replaceSelectionBy:newSpec.
-"Modified: / 05-09-2012 / 19:24:40 / cg"
-!
-TreeItem
 UIPainter
 [author:]
 Claus Atzkern
 "
-!
+! !
-ew)"
+!UIPainter::TreeView methodsFor:'accessing'!
+canvas
+"returns the canvas (UIPainterView)"
+^ model root contents view
+!
+canvas:aCanvas
+"install canvas (UIPainterView)"
 self canvas:aCanvas specName:nil
 !
-props := UIPainterView::ViewProperty new.
+canvas:aCanvas specName:nameOfSpec
+"install canvas (UIPainterView)"
+|props|
+props := UIPainterView::ViewProperty new.
 props view:aCanvas.
 model root:(TreeItem
 name:(nameOfSpec ? painter defaultNameOfCanvas) asBoldText
 contents:props).
 model root expand.
 self enableChannel:(aCanvas enableChannel).
 !
-model root expand.
+canvasSpec
-self enableChannel:(aCanvas enableChannel).
-!
-pec
 "returns spec assigned to canvas"
 |spec list cls canvas|
 spec := self windowSpecClass new.
 thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
 ].
 ^ spec
 !
-igned to canvas"
+canvasSpec:aSpec
+"update canvas from spec"
-|spec list cls canvas|
+|spec|
-spec := self windowSpecClass new.
-canvas := self canvas.
+self setAttributesFromWindowSpec:aSpec.
+spec := aSpec copy.
-spec fromView:(canvas topView) callBack:nil.
+spec  menu:nil.
+spec flags:nil.
-windowSpec notNil ifTrue:[
-spec copyValuesFromSpec:windowSpec.
+spec setAttributesIn:(self canvas "topView") with:(UIBuilder new isEditing:true).
-].
+!
-spec exportedAspects isNil ifTrue:[
+exportedAspects
-(     (cls  := canvas className) notNil
+"returns spec assigned to canvas"
-and:[(cls  := canvas resolveName:cls) notNil]
-) ifTrue:[
+windowSpec isNil ifTrue:[^ #()].
-list := cls perform:#aspectSelectors ifNotUnderstood:nil.
+^ windowSpec exportedAspects ? #()
-].
-spec setExportedAspectsFrom:list.
+!
-windowSpec notNil ifTrue:[
-windowSpec exportedAspects:(spec exportedAspects).
+itemOfView:aView
-]
+"returns item assigned to view or nil"
-].
+aView notNil ifTrue:[
-self propertiesDo:[:aProp|
-|propsSpec|
-spec exportedAspectsAddKey:(aProp model) type:nil.
-propsSpec := aProp spec.
-propsSpec aspectSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
-propsSpec actionSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-!
-spec := self windowSpecClass new.
-canvas := self canvas.
-spec fromView:(canvas topView) callBack:nil.
-windowSpec notNil ifTrue:[
-spec copyValuesFromSpec:windowSpec.
-].
-spec exportedAspects isNil ifTrue:[
-(     (cls  := canvas className) notNil
-and:[(cls  := canvas resolveName:cls) notNil]
-) ifTrue:[
-list := cls perform:#aspectSelectors ifNotUnderstood:nil.
-].
-spec setExportedAspectsFrom:list.
-windowSpec notNil ifTrue:[
-windowSpec exportedAspects:(spec exportedAspects).
-]
-].
-self propertiesDo:[:aProp|
-|propsSpec|
-spec exportedAspectsAddKey:(aProp model) type:nil.
-propsSpec := aProp spec.
-propsSpec aspectSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
-propsSpec actionSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-!
-l.
-windowSpec notNil ifTrue:[
-spec copyValuesFromSpec:windowSpec.
-].
-spec exportedAspects isNil ifTrue:[
-(     (cls  := canvas className) notNil
-and:[(cls  := canvas resolveName:cls) notNil]
-) ifTrue:[
-list := cls perform:#aspectSelectors ifNotUnderstood:nil.
-].
-spec setExportedAspectsFrom:list.
-windowSpec notNil ifTrue:[
-windowSpec exportedAspects:(spec exportedAspects).
-]
-].
-self propertiesDo:[:aProp|
-|propsSpec|
-spec exportedAspectsAddKey:(aProp model) type:nil.
-propsSpec := aProp spec.
-propsSpec aspectSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
-propsSpec actionSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-! !
-!UIPainter::TreeView methodsFor:'accessing-property'!
-as className) notNil
-and:[(cls  := canvas resolveName:cls) notNil]
-) ifTrue:[
-list := cls perform:#aspectSelectors ifNotUnderstood:nil.
-].
-spec setExportedAspectsFrom:list.
-windowSpec notNil ifTrue:[
-windowSpec exportedAspects:(spec exportedAspects).
-]
-].
-self propertiesDo:[:aProp|
-|propsSpec|
-spec exportedAspectsAddKey:(aProp model) type:nil.
-propsSpec := aProp spec.
-propsSpec aspectSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
-propsSpec actionSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-!
-stood:nil.
-].
-spec setExportedAspectsFrom:list.
-windowSpec notNil ifTrue:[
-windowSpec exportedAspects:(spec exportedAspects).
-]
-].
-self propertiesDo:[:aProp|
-|propsSpec|
-spec exportedAspectsAddKey:(aProp model) type:nil.
-propsSpec := aProp spec.
-propsSpec aspectSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
-propsSpec actionSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-!
-esDo:[:aProp|
-|propsSpec|
-spec exportedAspectsAddKey:(aProp model) type:nil.
-propsSpec := aProp spec.
-propsSpec aspectSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:nil].
-propsSpec actionSelectors
-select:[:a | a isString or:[a isSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-! !
-!UIPainter::TreeView methodsFor:'adding & removing'!
-sSymbol]]
-thenDo:[:aKey|spec exportedAspectsAddKey:aKey type:#action].
-].
-^ spec
-!
-spec
-!
-aView notNil ifTrue:[
 self allItemsDo:[:anItem|
 (anItem contents view == aView) ifTrue:[^ anItem]
 ]
 ].
 ^ nil
 !
-ass
+lastDrawnMaster
+"returns the lastDrawnMaster"
+^ lastDrawnMaster
+!
+painter
+^ painter
+!
+painter:something
+painter := something.
+!
+windowSpecClass
+"returns the default  windowSpecClass (WindowSpec)"
+^ windowSpecClass ? WindowSpec
+!
+windowSpecClass:aClass
 "set the default windowSpecClass"
 ^ windowSpecClass := aClass
 ! !
-!UIPainter::TreeView methodsFor:'building'!
+!UIPainter::TreeView methodsFor:'accessing-property'!
-yDetect:aOneArgBlock
+propertiesDo:aOneArgBlock
+"evaluates the argument a block on each property"
+self allItemsDo:[:anItem| aOneArgBlock value:(anItem contents)]
+!
+propertyDetect:aOneArgBlock
 "evaluates the block on each property"
 self allItemsDo:[:anItem|
 (aOneArgBlock value:(anItem contents)) ifTrue:[^ anItem contents]
 ].
 ^ nil
 !
-y beforeIndex:anIndex
+propertySelected
+"returns current selected property or nil in case of multi selection
+or empty selection "
+|idx|
+selection size == 1 ifTrue:[
+(idx := selection first) ~~ 1 ifTrue:[          "canvas: not yet supported"
+^ (listOfNodes at:idx) contents
+]
+].
+^ nil
+! !
+!UIPainter::TreeView methodsFor:'adding & removing'!
+addProperty:aProperty
+"adds a new item"
+^ self addProperty:aProperty beforeIndex:nil.
+!
+addProperty:aProperty beforeIndex:anIndex
 "adds a new item"
 |parent treeItem index|
 parent := self detectItemCorespondingToView:(aProperty view superView).
 (anIndex notNil and:[anIndex > 0]) ifTrue:[
 index := anIndex min:index.
 ].
 model add:treeItem beforeIndex:index below:parent.
 ^ treeItem
-! !
+!
-!UIPainter::TreeView methodsFor:'canvas selection'!
+removeAll
+"removes all items other than canvas"
-copy do:[:aView|
+lastDrawnMaster := nil.
+windowSpec := nil.
+self canvas components copy do:[:aView|
 aView destroy
 ].
 self canvas subViews copy do:[:aView|
 "/ care to not destroy the transparent input view
 (aView isInputOnly) ifFalse:[aView destroy]
 ].
 model root name: painter defaultNameOfCanvas asBoldText.
 model removeAllOtherThanRoot.
 !
-orComponents:aSpecArray named:specNameSymbol
+removeView:aView
+"removes a view"
+|item prnt|
+((item := self itemOfView:aView) notNil and:[(prnt := item parent) notNil]) ifTrue:[
+aView destroy.
+prnt contents view sizeChanged:nil.
+model remove:item
+]
+! !
+!UIPainter::TreeView methodsFor:'building'!
+generateFullSpecForComponents:aSpecArray named:specNameSymbol
 "generates a full spec from aSpecArray"
 |fullSpec winSpec|
 fullSpec := FullSpec new.
 ].
 winSpec name: winSpec label.
 ^ fullSpec.
 !
-wSpec (which should not)
+setAttributesFromWindowSpec:aWindowSpec
-self canvas gridShown ifTrue:[
+"sets a window spec from aWindowSpec and applies some attributes
-fullSpec window backgroundColor:nil.
+to the canvas."
-].
-] ifFalse:[
+|name canvasView builder|
-winSpec copyValuesFromSpec:windowSpec.
-].
-winSpec name: winSpec label.
-^ fullSpec.
-!
-|name canvasView builder|
 windowSpec := (self windowSpecClass) new copyValuesFromSpec:aWindowSpec.
 canvasView := self canvas.
 builder := UIBuilder new isEditing:true.
 canvasView topView name:name.
 self canvasNameChanged:name.
 self application treeSelectionChanged.
 ! !
-!UIPainter::TreeView methodsFor:'change & update'!
+!UIPainter::TreeView methodsFor:'canvas selection'!
-:= aWindowSpec label.
+canvasSelection:aSelection
-canvasView topView name:name.
+"canvas changed its selection
-self canvasNameChanged:name.
+"
-self application treeSelectionChanged.
+|sel list size|
-!
+((sel := aSelection) isNil or:[sel isCollection]) ifFalse:[
-True:[
+sel := Array with:sel
+].
+(size := sel size) ~~ 0 ifTrue:[
 list := OrderedCollection new:size.
 sel do:[:aView|
 |item|
 sel := list collect:[:anItem| self indexOfNode:anItem ].
 ].
 self canvasEventsDisabledDo:[ self selection:sel ].
 !
-]
+canvasSelectionAdd:aView
-].
+"canvas adds a view to current selection
-sel := list collect:[:anItem| self indexOfNode:anItem ].
+"
-].
+|item index oldSel|
-self canvasEventsDisabledDo:[ self selection:sel ].
-! !
+item := self itemOfView:aView.
-!UIPainter::TreeView methodsFor:'drag & drop'!
+item notNil ifTrue:[
+model doMakeVisible:item.
-election
+(index := self indexOfNode:item) ~~ 0 ifTrue:[
+oldSel := selection copy.
+self addToSelection:index.
+self selectionChangedFrom:oldSel
+]
+]
+!
+canvasSelectionRemove:aView
+"canvas removes a view from current selection
+"
+|item index oldSel|
+(     (item := self itemOfView:aView) notNil
+and:[(index := self indexOfNode:item) ~~ 0
+and:[self isInSelection:index]]
+) ifTrue:[
+oldSel := selection copy.
+self removeFromSelection:index.
+self selectionChangedFrom:oldSel.
+].
+!
+selectedViews
+^ self selection
 collect:[:index |
 |node view|
 node := listOfNodes at:index.
 view := node contents view.
 view
 ]
-!
+! !
-view
+!UIPainter::TreeView methodsFor:'change & update'!
-]
-!
+canvasNameChanged:aName
+"called if identification name assigned to window (canvas) changed
-fNodes at:1.
+"
+|name node|
+node := listOfNodes at:1.
 (    aName size ~~ 0
 and:[(name := aName string withoutSeparators) size ~~ 0
 and:[(self propertyDetect:[:p| p name = name]) isNil
 and:[node name ~= name]]]
 node name: name asBoldText.
 node changed.
 ].
 !
-]]
+layoutChanged
-) ifTrue:[
+"layout of any component changed; in case of single selection, the
-node name: name asBoldText.
+application will be informed to update its layout
-node changed.
-].
-!
-d to update its layout
 "
 selection size == 1 ifTrue:[
 self application layoutChanged
 ]
 !
-perty changed
+propertyChanged:aProperty
+"property of view derived from argument a property changed
 "
 |item idx end|
 item := self itemOfView:(aProperty view).
 self application propertyChanged
 ]
 ].
-!
-ame = aProperty name ifFalse:[
-idx := self firstLineShown.
-(end := self lastLineShown) > listOfNodes size ifTrue:[
-end := listOfNodes size
-].
-item changed.
-[idx <= end] whileTrue:[
-(listOfNodes at:idx) == item ifTrue:[
-self redrawLine:idx.                "/ is visible; redraw line
-end := 0
-] ifFalse:[
-idx := idx + 1
-]
-]
-].
-self selectedNode == item ifTrue:[              "/ inform application
-self application propertyChanged
-]
-].
-!
-].
-item changed.
-[idx <= end] whileTrue:[
-(listOfNodes at:idx) == item ifTrue:[
-self redrawLine:idx.                "/ is visible; redraw line
-end := 0
-] ifFalse:[
-idx := idx + 1
-]
-]
-].
-self selectedNode == item ifTrue:[              "/ inform application
-self application propertyChanged
-]
-].
 ! !
-!UIPainter::TreeView methodsFor:'enumerating'!
+!UIPainter::TreeView methodsFor:'drag & drop'!
-end := 0
+canDrop:aDropContext
-] ifFalse:[
+"can drop ? -> delegate to canvas"
-idx := idx + 1
-]
+^ self canvas canDrop:aDropContext
-]
-].
+"Modified: / 13-10-2006 / 16:08:43 / cg"
+!
-self selectedNode == item ifTrue:[              "/ inform application
-self application propertyChanged
+canDrop:aDropContext at:aPoint
-]
-].
-! !
-!UIPainter::TreeView methodsFor:'event handling'!
-rm application
-self application propertyChanged
-]
-].
-!
-ntext at:aPoint
 "can drop ? -> delegate to canvas"
 ^ self canvas canDrop:aDropContext at:aPoint
 "Created: / 13-10-2006 / 12:35:53 / cg"
 "Modified: / 13-10-2006 / 16:08:46 / cg"
 !
-/ cg"
+canDropObjects:aCollectionOfDropObjects
-"Modified: / 13-10-2006 / 16:08:46 / cg"
+"can drop ? -> delegate to canvas"
+^ self canvas canDropObjects:aCollectionOfDropObjects
+"Created: / 13-10-2006 / 16:08:31 / cg"
+!
+canDropObjects:aCollectionOfDropObjects at:aPoint
+"can drop ? -> delegate to canvas"
+^ self canvas canDropObjects:aCollectionOfDropObjects at:aPoint
+"Created: / 13-10-2006 / 16:08:35 / cg"
+!
+drop:aDropContext
+"drop objects -> delegate to canvas"
+self canvas drop:aDropContext
+"Created: / 13-10-2006 / 12:35:59 / cg"
+"Modified: / 13-10-2006 / 16:09:04 / cg"
+!
+drop:aDropContext at:aPoint
+"drop objects -> delegate to canvas"
+self canvas drop:aDropContext at:nil
+"Modified: / 13-10-2006 / 16:09:07 / cg"
+!
+dropObjects:aCollectionOfDropObjects
+"drop objects -> delegate to canvas"
+self canvas dropObjects:aCollectionOfDropObjects
+"Created: / 13-10-2006 / 16:08:51 / cg"
+!
+dropObjects:aCollectionOfDropObjects at:aPoint
+"drop objects -> delegate to canvas"
+self canvas dropObjects:aCollectionOfDropObjects at:nil
+"Created: / 13-10-2006 / 16:08:56 / cg"
 ! !
+!UIPainter::TreeView methodsFor:'enumerating'!
+allItemsDo:aOneArgBlock
+"evaluates the argument a block on each item other than the canvas"
+model root allChildrenDo:aOneArgBlock
+! !
+!UIPainter::TreeView methodsFor:'event handling'!
+canvasEventsDisabledDo:aBlock
+"evaluates the block without raising selection changed notifications to canvas"
+|restoreCanvasEvents|
+restoreCanvasEvents  := canvasEventsDisabled.
+canvasEventsDisabled := true.
+aBlock value.
+canvasEventsDisabled := restoreCanvasEvents.
+!
+doubleClicked
+"disables collapsing of the root item"
+self selectedNode == model root ifFalse:[
+super doubleClicked
+]
+!
+redrawLabelAt:x y:yTop index:anIndex
+"draws a tiny rectangle for indicating the master node (first selected node)"
+|dX|
+super redrawLabelAt:x y:yTop index:anIndex.
+((selection size > 1) and: [selection first == anIndex]) ifTrue:[
+dX := textInset - 1.
+self paint:(Color red). "/ self application painter handleMasterColor.
+self fillRectangleX:(x - dX - 2)
+y:yTop + ((fontHeight - dX) // 2)
+width:dX
+height:dX
+]
+! !
 !UIPainter::TreeView methodsFor:'initialization'!
-cg"
+iconForNode:aNode
-"Modified: / 13-10-2006 / 16:09:04 / cg"
+|spec|
-!
+spec := aNode contents spec.
-"Modified: / 13-10-2006 / 16:09:07 / cg"
+spec isNil ifTrue: [
-!
+^ WindowSpec icon
+] ifFalse:[
-: / 13-10-2006 / 16:08:56 / cg"
+^ spec icon
-! !
-!UIPainter::TreeView methodsFor:'private'!
-ock
-!
-Clicked
 ]
+!
-! !
+initialize
+"initialize the tree view; multiple select and tree item actions"
-!UIPainter::TreeView methodsFor:'queries'!
+super initialize.
-[
+self multipleSelectOk:true.
+canvasEventsDisabled := false.
+self showDirectoryIndicator: true.
+self showDirectoryIndicatorForRoot: false.
+self model
+iconAction:[:aNode| self iconForNode:aNode];
+labelAction: [:aNode | self labelForNode:aNode].
+!
+labelForNode:aNode
+|spec|
+spec := aNode contents spec.
+spec notNil ifTrue: [
+^ self nameForSpecInList:spec
+] ifFalse:[
 ^ aNode name
 ]
-!
+! !
-aspect := aSpec nameOfMainAspect.
+!UIPainter::TreeView methodsFor:'private'!
+nameForSpecInList:aSpec
+"returns the tree item label for aSpec"
+|aspect aspectPrefix nameString viewClassString|
+nameString := aSpec name ? ''.
+viewClassString := '[',aSpec viewClass name,']' .
+aspect := aSpec nameOfMainAspect.
 aspect notNil ifTrue:[
 aspectPrefix := '(',aspect allBold ,') '
 ] ifFalse:[
 aspectPrefix := ''.
 ].
 ^ aspectPrefix, nameString, ': ', viewClassString
 "Modified: / 17-08-2011 / 09:10:31 / cg"
 !
-m:oldSelection
+selectionChangedFrom:oldSelection
 "selection has changed. update master selection and raise notification
 to canvas in case of enabled cvs events
 "
 |sel size|
 ]
 ]
 ifFalse: [
 lastDrawnMaster := nil
 ]
-!
+! !
-].
+!UIPainter::TreeView methodsFor:'queries'!
-size = 1 ifTrue:[
-oldSelection size > 1 ifTrue: [
+canChangeOrderInContainer
-(listOfNodes at:lastDrawnMaster) retrieveLabel.
+"returns true if any selection exists and all widgets in the selection
-self redrawLine: lastDrawnMaster.
+can change their layout through to a move or align operation"
-lastDrawnMaster := selection first
-]
-].
-size > 1 ifTrue:[
-selection first ~~ lastDrawnMaster ifTrue: [
-(listOfNodes at:selection first) retrieveLabel.
-lastDrawnMaster notNil ifTrue: [(listOfNodes at:lastDrawnMaster) retrieveLabel].
-self redrawLine: lastDrawnMaster.
-self redrawLine: (lastDrawnMaster := selection first)
-]
-]
-ifFalse: [
-lastDrawnMaster := nil
-]
-!
-er := selection first)
-]
-]
-ifFalse: [
-lastDrawnMaster := nil
-]
-!
-on"
 ^(selection size == 1)  and:
 [(selection at: 1) ~~ 1 and:
 [self selectedNode parent children size > 1]]
 !
-AlignSelection
+canExchangeSelectionLayouts
+"returns true if the selections size is exactly 2
+and all widgets in the selection
+can change their layout through to a move or align operation"
+selection size == 2 ifFalse:[
+^ false
+].
+^ self canMoveOrAlignSelection
+!
+canMoveOrAlignSelection
 "returns true if any selection exists and all widgets in the selection
 can change their layout through to a move or align operation"
 selection isEmptyOrNil ifTrue:[
 ^ false
 ]
 ].
 ^ true
 !
-tyOrNil ifTrue:[
+canMoveSelectionIntoContainer
-^ false
-].
-selection do:[:i|
-|node view|
-i == 1 ifTrue:[
-"/ the tree node for the canvas itself.
-^ false
-].
-node := listOfNodes at:i.
-view := node contents view.
-(self canvas canChangeLayoutOfView:view) ifFalse:[
-^ false
-]
-].
-^ true
-!
-^ false
-].
-node := listOfNodes at:i.
-view := node contents view.
-(self canvas canChangeLayoutOfView:view) ifFalse:[
-^ false
-]
-].
-^ true
-! !
-!UIPainter::TreeView methodsFor:'searching'!
-ectionIntoContainer
 "returns true in case that one widget is selected and can change its container
 widget to an element below"
 |item oldParentItem newParentItem idx|
 ] startingAt:idx ifNone:nil.
 ^ newParentItem notNil.
 ].
 ^ false
-! !
+!
-!UIPainter::TreeView methodsFor:'user interaction'!
+canMoveSelectionOutOfContainer
+"returns true in case that one widget is selected which is contained within
-] startingAt:idx ifNone:nil.
-^ newParentItem notNil.
-].
-^ false
-!
-rue in case that one widget is selected which is contained within
 another widget"
 |item prnt|
 (     (item := self selectedNode) isNil
 ^ false
 ].
 ^ true
 !
-within a widget which allows to resize sub components"
+canResizeSelectedWidget
+"returns true in case of one widget selected and is contained
+within a widget which allows to resize sub components"
 |selectedNode|
 (selectedNode := self selectedNode) notNil ifTrue:[
 (selectedNode := selectedNode parent) notNil ifTrue:[
 ]
 ].
 ^ false
 !
-ctionChangeAllowed
+canResizeSelection
+"returns true if all selected widgets can be resized"
+selection isEmptyOrNil ifTrue:[ ^ false ].
+^ self canvas canResize:(self selectedViews)
+!
+hasOneSelectionOtherThanCanvas
+"returns true in case that one selection exists other than the canvas"
+^ selection size == 1 and:[selection first ~~ 1]
+!
+isCanvasSelected
+"returns true in case of a single selection and the
+selection is the canvas (index 1)"
+^ selection size == 1 and:[self isInSelection:1]
+! !
+!UIPainter::TreeView methodsFor:'searching'!
+detectItemCorespondingToView:aView
+"detects the item coresponding to the view. The item of the view or the first
+subview providing the item is returned. If no property is detected nil is
+returned"
+|view item|
+(view := aView) isNil ifTrue:[ ^ nil ].
+[(item := self itemOfView:view) isNil] whileTrue:[
+(view := view superView) isNil ifTrue:[^ listOfNodes at:1]
+].
+^ item
+! !
+!UIPainter::TreeView methodsFor:'user interaction'!
+askForSelectionChangeAllowed
 selectConditionBlock notNil ifTrue:[
 ^ selectConditionBlock value:nil
 ].
 ^ true
 !
-kForSelectionChangeAllowed ifFalse:[^ self].
+doChangeParentOfSelectedItemTo:newParentItem
+|canvas|
+newParentItem isNil ifTrue:[
+^ self
+].
+self askForSelectionChangeAllowed ifFalse:[^ self].
+self setSelection:nil.
+canvas := self canvas.
+canvas deleteSelection.
+canvas setSelection:(newParentItem contents view) withRedraw:false.
+canvas pasteWithLayout.
+!
+doSortItems
+"sort items by their top-left position"
+|selectedItems parent sortedItems newChildren itemList parentView|
+self askForSelectionChangeAllowed ifFalse:[^ self].
 selectedItems := self selectedNodes.
 selectedItems size <= 1 ifTrue:[^ self].
 parent := selectedItems first parent.
 (parent isNil or:[(selectedItems conform:[:e| e parent == parent]) not]) ifTrue:[^ self].
 self canvas showSelection.
 self selectNodes:itemList asOrderedCollection.
 !
-sNil or:[(selectedItems conform:[:e| e parent == parent]) not]) ifTrue:[^ self].
+doStepIn
+"move the currently selected widget into the next available container below"
-sortedItems := selectedItems sort:[:a :b|
-a contents view origin isLeftOrAbove:(b contents view origin)].
+|item oldParentItem newParentItem idx|
-itemList := selectedItems asIdentitySet.
+item := self selectedNode.
-newChildren := parent children collect:[:eachChild|
+(item notNil and:[(oldParentItem := item parent) notNil]) ifTrue:[
-(itemList includes:eachChild) ifTrue:[
+idx := (oldParentItem indexOfChild:item) + 1.
-sortedItems removeFirst.
+newParentItem := oldParentItem children
-] ifFalse:[
+detect:[:eachChild | eachChild contents spec class supportsSubComponents]
-eachChild.
+startingAt:idx
+ifNone:nil.
+newParentItem notNil ifTrue:[
+self doChangeParentOfSelectedItemTo:newParentItem
 ].
-].
+]
+!
+doStepOut
+|item|
+item := self selectedNode.
+(item notNil and:[(item := item parent) notNil]) ifTrue:[
+self doChangeParentOfSelectedItemTo:(item parent)
+].
+!
+doStepOver:anIndex
+"moves child 'anIndex' forward or backward in list of children"
+|item idx size parentItem parentItemsView itemsView canvas|
+self askForSelectionChangeAllowed ifFalse:[^ self].
+(    (item := self selectedNode) isNil
+or:[(parentItem := item parent) isNil
+or:[(size := parentItem children size) < 2
+or:[(idx  := parentItem indexOfChild:item) == 0]]]
+) ifTrue:[
+^ self
+].
+idx := idx + anIndex.
+idx < 1 ifTrue:[idx := size]
+ifFalse:[idx > size ifTrue:[idx := 1]].
 self setSelection:nil.
-model remove:parent children.
+model remove:item.
-model add:newChildren beforeIndex:1 below:parent.
+model add:item beforeIndex:idx below:parentItem.
-parentView := parent contents view.
+idx := parentItem indexOfChild:item.
+itemsView := item contents view.
-self canvas hideSelection.
+parentItemsView := parentItem contents view.
-newChildren keysAndValuesDo:[:idx :eachItem|
-parentView changeSequenceOrderFor:eachItem contents view to:idx.
+canvas := self canvas.
-].
+canvas hideSelection.
-parentView specClass isLayoutContainer ifFalse:[
-parentView components notEmptyOrNil ifTrue:[ self halt ].
+itemsView isView ifFalse:[
-parentView subViews do:[:v| v raise ].
+"/ a component - has its own collection (and therefore indexing) - sigh
-].
+idx := idx - ((1 to:idx-1) count:[:i | (parentItem children at:i) contents view isView]).
-self canvas showSelection.
+parentItemsView changeSequenceOrderFor:itemsView to:idx.
+] ifTrue:[
-self selectNodes:itemList asOrderedCollection.
+"/ a view - has its own collection (and therefore indexing) - sigh
+idx := idx - ((1 to:idx-1) count:[:i | (parentItem children at:i) contents view isView not]).
+parentItemsView changeSequenceOrderFor:itemsView to:idx.
+].
+parentItemsView specClass isLayoutContainer ifFalse:[
+"/ spVw components notEmptyOrNil ifTrue:[ self halt ].
+parentItemsView subViews do:[:v| v raise ].
+].
+canvas showSelection.
+self selectNode:item.
 ! !
 !UIPainter class methodsFor:'documentation'!
 version

changeset 3053	db8d30e7a621
parent 3051	ebb32d3a997e
child 3054	22d13f07a426