hg/stx-libtool2: comparison UIPainterView.st

equal deleted inserted replaced

-:ae171f5bc002
+:a6a7ef98fdc3
 !
 copySelection
 "copy the selection into the cut & paste-buffer"
-|specs coll sel|
+|specs coll|
-sel := treeView selection.
 coll := self minClosedViewSetFor:(self selection).
 coll notNil ifTrue:[
 "/        self select:nil.
-specs := coll collect:[:aView| self fullSpecFor:aView ].
+specs := coll collect:[:eachView | self fullSpecWithAbsolutePositionFor:eachView].
 self setClipboardObject:specs.
 "/        treeView selection: sel
 ].
 !
 newSelection := 1
 ].
 self hideSelection.
 selection := nil.
-specs := specsToRemove collect:[:aView| self fullSpecFor:aView ].
+specs := specsToRemove collect:[:aView| self fullSpecWithAbsolutePositionFor:aView ].
 self withinTransaction:#cut objects:specsToRemove do:[
 specsToRemove reverseDo:[:aView|
 self createUndoRemove:aView.
 self remove:aView.
 "add the objects in the paste-buffer to the object view;
 don't change the layout if more than a single item has been selected"
 |sel clipboard|
+self enabled ifFalse:[
+Dialog warn:'Operation currently disabled (In geometry test mode)'.
+^ self
+].
 clipboard := self getClipboardObject.
-sel := self pasteSpecifications:clipboard keepLayout:(clipboard size > 1).
+sel := self pasteSpecifications:clipboard keepLayout:true "(clipboard size > 1)".
 self changeSelectionAfterPasteOf:sel.
 !
 pasteKeepingPosition
 "add the objects in the paste-buffer to the object view;
 "add the specs to the object view; returns list of pasted widgets"
 ^ self
 pasteSpecifications:aSpecificationOrList
 keepLayout:keepLayout
+keepPosition:true
 at:nil
 "Modified: 11.8.1997 / 01:00:35 / cg"
 !
 "add the specs to the object view; returns list of pasted widgets"
 ^ self
 pasteSpecifications:aSpecificationOrList
 keepLayout:keepLayout
-keepPosition:false
+keepPosition:true
 at:aPointOrNil
 !
 pasteSpecifications:aSpecificationOrList keepLayout:keepLayout keepPosition:keepPosition at:aPointOrNil
 "add the specs to the object view; returns list of pasted widgets"
-|specsToPaste pasteOrigin pasteOffset builder newSel bounds containerToPasteInto|
+|specsToPaste pasteOffset builder newSel
+bounds containerToPasteInto pastePoint|
 treeView askForSelectionChangeAllowed ifFalse:[^ nil].
-containerToPasteInto := self singleSelection.
+(self window sensor shiftDown
+or:[ self window sensor ctrlDown ]) ifTrue:[
+"/ paste into the selection
+containerToPasteInto := self singleSelection.
+] ifFalse:[
+"/ ignore the selection and paste where we drop!!
+pastePoint := aPointOrNil.
+pastePoint isNil ifTrue:[
+pastePoint := device
+translatePoint:(self sensor mousePoint)
+fromView:nil
+toView:self.
+].
+containerToPasteInto := self findObjectAt:pastePoint
+].
 containerToPasteInto isNil ifTrue:[
 self selection size > 0 ifTrue:[
 containerToPasteInto := self commonContainerOf:self selection
 ] ifFalse:[
 containerToPasteInto := self
 ].
 "/        self selection:containerToPasteInto.
 ].
-(self canPasteInto:containerToPasteInto) ifFalse:[
+"/ search up parent list for something we can paste into
-containerToPasteInto notNil ifTrue:[
+[containerToPasteInto notNil and:[(self canPasteInto:containerToPasteInto) not]] whileTrue:[
-"/ search up parent list for something we can paste into
+containerToPasteInto == self ifTrue:[
-[containerToPasteInto notNil and:[(self canPasteInto:containerToPasteInto) not]] whileTrue:[
+containerToPasteInto := nil
-containerToPasteInto == self ifTrue:[
+] ifFalse:[
-containerToPasteInto := nil
+containerToPasteInto := containerToPasteInto container.
-] ifFalse:[
-containerToPasteInto := containerToPasteInto container.
-].
-].
-"/            self selection:containerToPasteInto.
 ].
 ].
 containerToPasteInto isNil ifTrue:[
 containerToPasteInto := self
 ].
 (self canPaste:aSpecificationOrList into:containerToPasteInto)
 ifFalse:[
-Dialog warn:'Cannot paste into selected component (not a container ?)'.
+self enabled ifTrue:[
+Dialog warn:'Cannot paste into selected component (not a container ?)'.
+] ifFalse:[
+Dialog warn:'Operation currently disabled (In Geometry test mode)'.
+].
 ^ nil
 ].
 aSpecificationOrList isCollection ifTrue:[
 specsToPaste := aSpecificationOrList
 builder := UIBuilder new isEditing:true.
 className notNil ifTrue:[
 builder applicationClass:(self resolveName:className)
 ].
+bounds := Rectangle origin:0@0 extent:(containerToPasteInto bounds extent).
-(keepLayout not or:[keepPosition]) ifTrue:[
-pasteOffset := 0@0.
+pasteOffset := 0.
+specsToPaste do:[:eachSpec|
+|view newOrigin uiPainterAttributes thisAbsOrigin|
+uiPainterAttributes := eachSpec otherAttributeAt:#uiPainterAttributes.
+eachSpec otherAttributeAt:#uiPainterAttributes put:nil.
+view := self addSpec:eachSpec builder:builder in:containerToPasteInto.
 keepPosition ifTrue:[
-pasteOrigin := device translatePoint:0@0
+thisAbsOrigin := uiPainterAttributes at:#absOrigin.
-fromView:self
+newOrigin := device
-toView:containerToPasteInto.
+translatePoint:thisAbsOrigin
+fromView:self
+toView:containerToPasteInto.
 ] ifFalse:[
-aPointOrNil isNil ifTrue:[
+pastePoint isNil ifTrue:[ pastePoint := 0@0 ].
-pasteOrigin := device translatePoint:(self sensor mousePoint)
+newOrigin := device
-fromView:nil
+translatePoint:pastePoint
-toView:containerToPasteInto.
+fromView:self
-] ifFalse:[
+toView:containerToPasteInto.
-pasteOrigin := device translatePoint:aPointOrNil
+].
-fromView:self
-toView:containerToPasteInto.
+(bounds containsPoint:newOrigin) ifFalse:[
-]
+newOrigin := pasteOffset asPoint.
-].
+pasteOffset := pasteOffset + 4.
+].
-bounds := Rectangle origin:0@0 extent:(containerToPasteInto bounds extent)
+newOrigin notNil ifTrue:[
-].
+self moveObject:view to:newOrigin.
-specsToPaste do:[:eachSpec|
-|view newOrigin|
-view := self addSpec:eachSpec builder:builder in:containerToPasteInto.
-keepPosition ifTrue:[
-self moveObject:view to:(view origin + pasteOrigin).
-] ifFalse:[
-keepLayout ifFalse:[
-(bounds containsPoint:pasteOrigin) ifFalse:[
-newOrigin := pasteOffset.
-] ifTrue:[
-newOrigin := pasteOrigin + pasteOffset.
-].
-self moveObject:view to:newOrigin.
-pasteOffset := pasteOffset + 4
-].
 ].
 view realize.
 newSel add:view.
 ].
 !
 canDropObjects:aCollectionOfDropObjects
 "returns true if something can be dropped"
-^ (aCollectionOfDropObjects size == 1
+^ (true "aCollectionOfDropObjects size == 1"
 and:[ self enabled
-and:[ self numberOfSelections <= 1
+and:[ true "self numberOfSelections <= 1"
-and:[ aCollectionOfDropObjects first theObject isKindOf:UISpecification ]]])
+and:[ aCollectionOfDropObjects conform:[:each| each theObject isKindOf:UISpecification]
+]]])
 "Created: / 13-10-2006 / 16:09:24 / cg"
 !
 canPaste
 self setSelection:widg withRedraw:true.
 ].
 spec := (aCollectionOfDropObjects at:1) theObject.
 doit ifTrue:[
 dragOffset := DragAndDropManager dragOffsetQuerySignal query.
-newSel := self pasteSpecifications:spec keepLayout:false at:aPoint - dragOffset.
+newSel := self pasteSpecifications:spec keepLayout:false keepPosition:false at:aPoint - dragOffset.
 self select:(oldSel ? newSel)
 ].
 "Modified: / 18-03-1999 / 18:29:43 / stefan"
 findObjectAt:aPoint
 |view prop|
 view := super findObjectAt:aPoint.
+"/ stupid check, if I know about this view
 prop := self propertyOfView:view.
 prop notNil ifTrue:[^ prop view].
 ^ nil
 !
 findViewWithId:aViewId
 ^ aSpecification buildViewWithLayoutFor:aBuilder in:aFrame.
 "Modified: 4.7.1997 / 23:48:55 / cg"
 !
-fullSpecFor:anObject
+fullSpecFor:aView
 "generate a full spec for an object
 "
 |mySpec subSpecs|
-mySpec := self specFor:anObject.
+mySpec := self specFor:aView.
 (mySpec notNil and:[mySpec class supportsSubComponents]) ifTrue:[
-	(anObject subViews notNil) ifTrue:[
+(aView subViews notNil) ifTrue:[
-	    anObject subViews do:[:aSubView||spec|
+aView subViews do:[:aSubView||spec|
-		spec := self fullSpecFor:aSubView.
+spec := self fullSpecFor:aSubView.
-		spec notNil ifTrue:[
+spec notNil ifTrue:[
-		    subSpecs isNil ifTrue:[
+subSpecs isNil ifTrue:[
-			subSpecs := OrderedCollection new
+subSpecs := OrderedCollection new
-		    ].
+].
-		    subSpecs add:spec.
+subSpecs add:spec.
-		].
+].
-	    ].
+].
-	    subSpecs notNil ifTrue:[
+subSpecs notNil ifTrue:[
-		mySpec component:(SpecCollection new collection:subSpecs)
+mySpec component:(SpecCollection new collection:subSpecs)
-	    ]
+]
-	]
+]
 ].
 ^ mySpec
+!
+fullSpecWithAbsolutePositionFor:aView
+|spec|
+spec := self fullSpecFor:aView.
+spec
+otherAttributeAt:#uiPainterAttributes
+put:(Dictionary new
+at:#origin put:aView origin;
+at:#extent put:aView extent;
+at:#absOrigin put:(aView originRelativeTo:self);
+yourself).
+^ spec
 !
 rebuildView:aView fromSpec:aSpec withBuilder:aBuilderOrNil
 self
 rebuildView:aView fromSpec:aSpec withBuilder:aBuilderOrNil forceNewView:false
 aSpec setAttributesIn:aView with:builder.
 self elementChangedSize:aView.
 ].
 !
-specFor:anObject
+specFor:aView
-"returns spec assigned to an object
+"returns a copy of the spec assigned to an object"
-"
 |prop spec|
-(prop := self propertyOfView:anObject) isNil ifTrue:[^ nil].
+(prop := self propertyOfView:aView) isNil ifTrue:[^ nil].
 spec := prop spec copy.
-spec layoutFromView:anObject.
+spec layoutFromView:aView.
 ^ spec
 !
 specForSelection
 "returns spec assigned to current single selection or nil
 ! !
 !UIPainterView methodsFor:'testing'!
 canChangeLayoutOfView:aView
-"returns true if the view can change its layout which is dependant on
+"returns true if the view can change its layout.
-its parent view.
+This is dependent on its parent view."
-"
-|item prnt|
+|item parent granny|
-(     (item := treeView itemOfView:aView) isNil
+item := treeView itemOfView:aView.
-or:[(prnt := item parent) isNil]
+item isNil ifTrue:[
-) ifTrue:[
+"/ I dont know anything about that view (cg: how can this happen ?)
-	^ false
+"/ self breakPoint:#cg.
-].
+^ false
-^ (prnt parent isNil or:[prnt contents spec class isLayoutContainer not])
+].
+parent := item parent.
+parent isNil ifTrue:[
+"/ that view has no parent (cg: does this mean its the canvas itself ?)
+"/ self breakPoint:#cg.
+^ false
+].
+granny := parent parent.
+granny isNil ifTrue:[
+"/ cg: why that ?
+"/ self breakPoint:#cg.
+^ true
+].
+parent contents spec class isLayoutContainer ifTrue:[
+"/ self breakPoint:#cg.
+^ false
+].
+^ true
 !
 canExchangeSelectionLayouts
 "returns true if the selection size is exactly 2
 and all elements in the selection can be moved or aligned
 canMove:something
 "checks whether something is not nil and if all widgets derived from
 something can change their layout ( move, align, ... operation ).
 "
 something notNil ifTrue:[
-	self forEach:something do:[:aView|
+self forEach:something do:[:aView|
-	    (self canChangeLayoutOfView:aView) ifFalse:[^ false]
+(self canChangeLayoutOfView:aView) ifFalse:[^ false]
-	].
+].
-	^ true
+^ true
 ].
 ^ false
 !
 canMoveOrAlignSelection
 "returns true if a selection exists and all elements in the selection
 can be moved or aligned
 "
 ^ self canMove:(self selection)
 ! !
 !UIPainterView methodsFor:'transaction'!
 transaction:aType objects:something do:aOneArgBlock
 	self forEach:something do:aOneArgBlock
 ]
 !
 withinTransaction:aType objects:objects do:aNoArgBlock
-"evaluate a block with no arguments within a transaction
+"evaluate a block within a transaction"
-"
 |text size prop|
 objects isNil ifTrue:[ ^ self ].
 size := objects size.
 objects isCollection ifTrue:[
 size == 0 ifTrue:[ ^ self ].
-size == 1 ifTrue:[ prop := self propertyOfView:(objects first) ]
+size == 1 ifTrue:[
+prop := self propertyOfView:(objects first)
+]
 ] ifFalse:[
 prop := self propertyOfView:objects
 ].
 prop notNil ifTrue:[

changeset 2362	a6a7ef98fdc3
parent 2358	ba3ed08ea8dd
child 2366	69ed2aeb7e3d