hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:961e4b080571
+:408cba0cbef4
 	poolDictionaries:''
 	privateIn:UIObjectView
 !
 Object subclass:#ResizeData
-	instanceVariableNames:'object selector delta'
+	instanceVariableNames:'object selector checkForChangeSelector delta'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:UIObjectView
 !
 !UIObjectView methodsFor:'misc'!
 invertOutlineOf:something
 "invert outline of an object or collection of objects"
-|wasClipped|
+^ self.
-^ self.
+"/ cg: nope - all done via handles now.
-(wasClipped := clipChildren) ifTrue:[
-self clippedByChildren:(clipChildren := false).
+"/    |wasClipped|
-].
+"/
+"/    (wasClipped := clipChildren) ifTrue:[
-self xoring:[
+"/        self clippedByChildren:(clipChildren := false).
-|p|
+"/    ].
+"/
-something isCollection ifTrue:[
+"/    self xoring:[
-something do:[:v |
+"/        |p|
-p := v originRelativeTo:self.
+"/
-self displayRectangle:(p extent:v extent).
+"/        something isCollection ifTrue:[
-].
+"/            something do:[:v |
-] ifFalse:[
+"/                p := v originRelativeTo:self.
-p := something originRelativeTo:self.
+"/                self displayRectangle:(p extent:v extent).
-self displayRectangle:(p extent:something extent).
+"/            ].
-]
+"/        ] ifFalse:[
-].
+"/            p := something originRelativeTo:self.
+"/            self displayRectangle:(p extent:something extent).
-wasClipped ifTrue:[
+"/        ]
-self clippedByChildren:(clipChildren := true).
+"/    ].
-].
+"/
+"/    wasClipped ifTrue:[
+"/        self clippedByChildren:(clipChildren := true).
+"/    ].
 !
 minClosedViewSetFor:setOfViews
 "return the minimum closure for a given set of view;
 That is the minimum set of views which contains the given set of views.
 ! !
 !UIObjectView methodsFor:'object moving'!
 doObjectMove:aPoint
-"move movedOject (which is a misnomer - its actually a collection of objects to move)"
+"move movedOject (which is a misnomer - it's actually a collection of objects to move)"
-movedObject notNil ifTrue:[
+|anyMove|
-self hideSelection.
+movedObject isEmptyOrNil ifTrue:[^ self].
-self invertOutlineOf:movedObject.
+anyMove := false.
-movedObject keysAndValuesDo:[:i :v|
+"/ to avoid flicker, check if this really involves a move (due to align)
-self moveObject:v to:(aPoint - (moveDelta at:i)).
+movedObject keysAndValuesDo:[:i :obj|
-].
+|newOrigin delta|
-self invertOutlineOf:movedObject.
+newOrigin := (aPoint - (moveDelta at:i)).
-self showSelection.
+delta := (self alignToGrid:newOrigin) - obj computeOrigin.
-]
+delta ~= (0@0) ifTrue:[ anyMove := true ].
+].
+anyMove ifFalse:[^ self ].
+self hideSelection.
+self invertOutlineOf:movedObject.
+movedObject keysAndValuesDo:[:i :v|
+self moveObject:v to:(aPoint - (moveDelta at:i)).
+].
+self invertOutlineOf:movedObject.
+self showSelection.
 !
 endObjectMove
 "cleanup after object(s) move
 send expose to each view - workaround....
 movedObject size == 1 ifTrue:[ newSel := movedObject first ]
 ifFalse:[ newSel := movedObject ].
 movedObject := nil.
-self withSelectionHiddenDo:[
+"/    self withSelectionHiddenDo:[
-self setSelection:newSel withRedraw:false.
+"/        self setSelection:newSel withRedraw:false.
+"/
-components notEmptyOrNil ifTrue:[
+"/        components notEmptyOrNil ifTrue:[
-self invalidate.
+"/            self invalidate.
-].
+"/        ].
-self allSubViewsDo:[:v|
+"/        self allSubViewsDo:[:v|
-v shown ifTrue:[
+"/            v shown ifTrue:[
-v fill:v viewBackground.
+"/                v fill:v viewBackground.
-v exposeX:0 y:0 width:v width height:v height.
+"/                v exposeX:0 y:0 width:v width height:v height.
-].
+"/            ].
-].
+"/        ].
+"/    ].
-self setDefaultActions.
-self layoutChanged.
+self setDefaultActions.
-].
+self layoutChanged.
 !
 moveObject:anObject to:aPoint
 "move anObject to newOrigin, aPoint"
 ! !
 !UIObjectView methodsFor:'object resize'!
 actionResize:anObject selector:aSelector
-"create and initialize action for resize
+"create and initialize action for resize"
-"
-|selector delta|
+|delta|
 delta    := anObject container originRelativeTo:self.
-selector := ('resize:', aSelector, ':') asSymbol.
 resizeData := ResizeData new
-		      object:anObject selector:selector delta:delta.
+object:anObject
+selector:aSelector
+delta:delta.
 "can change cursor dependent on vertical/horizontal resizing
 "
 oldCursor := cursor.
 self cursor:(Cursor leftHand).
 "Modified: / 2.2.1998 / 13:40:55 / cg"
 !
 doDragResize:aPoint
-"do a widget resize drag
+"do a widget resize drag"
-"
 |p object|
 object := resizeData object.
+p := (self alignToGrid:aPoint) - (resizeData delta).
+(self resize:object handle:(resizeData selector) to:p check:true) ifFalse:[
+^ self  "/ no real change (due to align)
+].
 self hideSelection.
 self invertOutlineOf:object.
-p := (self alignToGrid:aPoint) - (resizeData delta).
+self resize:object handle:(resizeData selector) to:p check:false.
-self perform:(resizeData selector) with:object with:p.
 Delay waitForSeconds:0.05.
 [self sensor hasExposeEventFor:nil] whileTrue:[
 self windowGroup processExposeEvents
 ].
 self showSelection.
 !
 endResize
-"cleanup after object resize
+"cleanup after object resize"
-"
-|object savedSelection|
+|object savedSelection anyLayoutWrapper anyTransparentBox|
 object := resizeData object.
 resizeData := nil.
-self invertOutlineOf:object.
+"/ container objects might want to rearrange their elements after a size change;
+"/ therefore, we hide the handles while this is possibly done.
-"/ temporarily hide the selection, in order to allow the container to move the
+"/ however, to avoid flicker, we check for containers first.
-"/ element around...
+anyLayoutWrapper := anyTransparentBox := false.
-savedSelection := selection.
+self forEach:object do:[:aViewOrComponent |
-self selection:nil.
+aViewOrComponent isLayoutWrapper ifTrue:[ anyLayoutWrapper := true ].
-"/ handle any expose events (for subcomponents) before
+aViewOrComponent isTransparentBox ifTrue:[ anyTransparentBox := true ].
-"/ redrawing the handles.
+].
-self windowGroup processExposeEvents.
+(anyLayoutWrapper or:[anyTransparentBox]) ifTrue:[
+self invertOutlineOf:object.
+"/ temporarily hide the selection, in order to allow the container to move the
+"/ element around...
+savedSelection := selection.
+self setSelection:nil withRedraw:true.
+"/ handle any expose events (for subcomponents) before
+"/ redrawing the handles.
+self windowGroup processExposeEvents.
+self elementChangedSize:object.
+"/ handle any expose events (for subcomponents) before
+"/ redrawing the handles.
+Delay waitForSeconds:0.05.
+[self sensor hasExposeEventFor:nil] whileTrue:[
+self windowGroup processExposeEvents
+].
+self forEach:savedSelection do:[:aView |
+self recomputeShapeIfTransparentBox:aView.
+].
+self setSelection:object withRedraw:true.
+].
+self layoutChanged.
 self setDefaultActions.
-self elementChangedSize:object.
-"/ handle any expose events (for subcomponents) before
-"/ redrawing the handles.
-Delay waitForSeconds:0.05.
-[self sensor hasExposeEventFor:nil] whileTrue:[
-self windowGroup processExposeEvents
-].
-self forEach:savedSelection do:[:aView |
-self recomputeShapeIfTransparentBox:aView.
-].
-self layoutChanged.
-self selection:savedSelection.
-self setSelection:object withRedraw:true.
 !
 layoutChanged
+!
+resize:aView bottom:aPoint
+"obsolete: resize a views bottom"
+self resize:aView handle:#bottom to:aPoint check:false.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
+"/    ].
+!
+resize:aView bottomLeft:aPoint
+"obsolete: resize a views bottom and left"
+self resize:aView handle:#bottomLeft to:aPoint check:false.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView top:0
+"/                            bottom:((aPoint y) - (aView computeCorner y))
+"/                              left:((aPoint x) - (aView computeOrigin x))
+"/                             right:0
+"/
+"/    ]
+!
+resize:aView corner:aPoint
+"obsolete: resize a views corner"
+self resize:aView handle:#corner to:aPoint check:false.
+"/    |delta|
+"/
+"/    delta := aPoint - aView computeCorner.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView top:0 bottom:(delta y) left:0 right:(delta x)
+"/    ]
+!
+resize:aComponent endPoint:newEndPoint
+"obsolete: move a component's endPoint"
+self resize:aComponent handle:#endPoint to:newEndPoint check:false
+"/    undoHistory
+"/        withoutTransactionDo:[
+"/            self shiftLayout:aComponent startPoint:0 endPoint:(newEndPoint - (aComponent endPoint))
+"/        ]
+!
+resize:aComponent handle:aSymbol to:aPoint check:doCheck
+"resize a views handle - if doCheck is true, only check if the handle would change
+(used to avoid flicker, when an aligned move would actually not move anything)"
+|newX newY oldBottom oldTop oldLeft oldRight
+oldOrigin oldCorner shiftTop shiftBottom shiftLeft shiftRight|
+aSymbol == #startPoint ifTrue:[
+doCheck ifTrue:[
+^ aPoint ~= (aComponent startPoint)
+].
+self
+shiftLayout:aComponent
+startPoint:(aPoint - (aComponent startPoint)) endPoint:0.
+^ self.
+].
+aSymbol == #endPoint ifTrue:[
+doCheck ifTrue:[
+^ aPoint ~= (aComponent endPoint)
+].
+self
+shiftLayout:aComponent
+startPoint:0 endPoint:(aPoint - (aComponent endPoint)).
+^ self.
+].
+newX := aPoint x.
+newY := aPoint y.
+shiftTop := shiftBottom := shiftLeft := shiftRight := 0.
+oldOrigin := aComponent computeOrigin.
+oldCorner := aComponent computeCorner.
+oldTop := oldOrigin y.
+oldBottom := oldCorner y.
+oldLeft := oldOrigin x.
+oldRight := oldCorner x.
+aSymbol == #bottom ifTrue:[
+shiftBottom := newY - oldBottom.
+].
+aSymbol == #top ifTrue:[
+shiftTop := newY - oldTop.
+].
+aSymbol == #left ifTrue:[
+shiftLeft := newX - oldLeft.
+].
+aSymbol == #right ifTrue:[
+shiftRight := newX - oldRight.
+].
+aSymbol == #origin ifTrue:[
+shiftLeft := newX - oldLeft.
+shiftTop := newY - oldTop.
+].
+aSymbol == #topRight ifTrue:[
+shiftRight := newX - oldRight.
+shiftTop := newY - oldTop.
+].
+aSymbol == #corner ifTrue:[
+shiftRight := newX - oldRight.
+shiftBottom := newY - oldBottom.
+].
+aSymbol == #bottomLeft ifTrue:[
+shiftLeft := newX - oldLeft.
+shiftBottom := newY - oldBottom.
+].
+doCheck ifTrue:[
+^ (shiftTop ~= 0) or:[ shiftBottom ~= 0 or:[ shiftLeft ~= 0 or:[ shiftRight ~= 0 ]]]
+].
+undoHistory withoutTransactionDo:[
+self
+shiftLayout:aComponent
+top:shiftTop bottom:shiftBottom
+left:shiftLeft right:shiftRight
+].
+!
+resize:aView left:aPoint
+"obsolete: resize a views left"
+self resize:aView handle:#left to:aPoint check:false.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView left:((aPoint x) - (aView computeOrigin x)) right:0
+"/    ]
+!
+resize:aView origin:aPoint
+"obsolete: resize a views origin"
+self resize:aView handle:#origin to:aPoint check:false.
+"/    |delta|
+"/
+"/    delta := aPoint - aView computeOrigin.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView top:(delta y) bottom:0 left:(delta x) right:0
+"/    ]
+!
+resize:aView right:aPoint
+"obsolete: resize a views right"
+self resize:aView handle:#right to:aPoint check:false.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
+"/    ]
+!
+resize:aComponent startPoint:newStartPoint
+"obsolete: move a component's startPoint"
+self resize:aComponent handle:#startPoint to:newStartPoint check:false
+"/    undoHistory
+"/        withoutTransactionDo:[
+"/            self shiftLayout:aComponent startPoint:(newStartPoint - (aComponent startPoint)) endPoint:0
+"/        ]
+!
+resize:aView top:aPoint
+"obsolete: resize a views top"
+self resize:aView handle:#top to:aPoint check:false.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView
+"/                top:((aPoint y) - (aView computeOrigin y))
+"/                bottom:0
+"/    ]
+!
+resize:aView topRight:aPoint
+"obsolete: resize a views top and right"
+self resize:aView handle:#topRight to:aPoint check:false.
+"/    undoHistory withoutTransactionDo:[
+"/        self shiftLayout:aView
+"/                top:((aPoint y) - (aView computeOrigin y))
+"/                bottom:0
+"/                left:0
+"/                right:((aPoint x) - (aView computeCorner x))
+"/    ]
 !
 startResizeBorder:borderHandleSelector
 "start resizing the selected view at the given borderHandle"
 recomputeShapeIfTransparentBox:aView
 (aView notNil and:[aView isTransparentBox]) ifTrue:[
 aView computeShape.
 aView clear; redraw
 ].
-!
-resize:aView bottom:aPoint
-"resize a views bottom"
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
-].
-!
-resize:aView bottomLeft:aPoint
-"resize a views bottom and left"
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:0
-bottom:((aPoint y) - (aView computeCorner y))
-left:((aPoint x) - (aView computeOrigin x))
-right:0
-]
-!
-resize:aView corner:aPoint
-"resize a views corner"
-|delta|
-delta := aPoint - aView computeCorner.
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:0 bottom:(delta y) left:0 right:(delta x)
-]
-!
-resize:aComponent endPoint:newEndPoint
-"move a component's endPoint"
-undoHistory
-withoutTransactionDo:[
-self shiftLayout:aComponent startPoint:0 endPoint:(newEndPoint - (aComponent endPoint))
-]
-!
-resize:aView left:aPoint
-"resize a views left"
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView left:((aPoint x) - (aView computeOrigin x)) right:0
-]
-!
-resize:aView origin:aPoint
-"resize a views origin"
-|delta|
-delta := aPoint - aView computeOrigin.
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:(delta y) bottom:0 left:(delta x) right:0
-]
-!
-resize:aView right:aPoint
-"resize a views right"
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
-]
-!
-resize:aComponent startPoint:newStartPoint
-"move a component's startPoint"
-undoHistory
-withoutTransactionDo:[
-self shiftLayout:aComponent startPoint:(newStartPoint - (aComponent startPoint)) endPoint:0
-]
-!
-resize:aView top:aPoint
-"resize a views top"
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView
-top:((aPoint y) - (aView computeOrigin y))
-bottom:0
-]
-!
-resize:aView topRight:aPoint
-"resize a views top and right"
-undoHistory withoutTransactionDo:[
-self shiftLayout:aView
-top:((aPoint y) - (aView computeOrigin y))
-bottom:0
-left:0
-right:((aPoint x) - (aView computeCorner x))
-]
 ! !
 !UIObjectView methodsFor:'private-shift layout'!
 shiftLayout:aViewOrComponent horizontal:n
 !
 shiftLayout:aView top:t bottom:b left:l right:r
 "shift layout for a view; in case of an open transaction, the undo action is registered"
-|type layout oldExt|
+|type layout oldExt dX dY|
 type := self class layoutType:aView.
+type isNil ifTrue:[ ^ self ].
-type notNil ifTrue:[
 self createUndoLayout:aView.
 type == #Extent ifTrue:[
 oldExt := aView extent.
-aView extent:(oldExt + ((r-l) @ (b-t))).
+dX := r-l.
-^ self
+dY := b-t.
-].
+aView extent:(oldExt + (dX @ dY)).
+^ self
-layout := aView geometryLayout copy.
+].
-layout isLayout ifTrue:[
+layout := aView geometryLayout copy.
-layout leftOffset:(layout leftOffset + l)
+layout isLayout ifTrue:[
-topOffset:(layout topOffset  + t).
+layout leftOffset:(layout leftOffset + l)
+topOffset:(layout topOffset  + t).
-type == #LayoutFrame ifTrue:[
-layout bottomOffset:(layout bottomOffset + b).
+type == #LayoutFrame ifTrue:[
-layout  rightOffset:(layout rightOffset  + r).
+layout bottomOffset:(layout bottomOffset + b).
-]
+layout rightOffset:(layout rightOffset  + r).
-] ifFalse:[
+]
-type == #Rectangle ifTrue:[
+] ifFalse:[
-layout left:(layout left   + l)
+type == #Rectangle ifTrue:[
-right:(layout right  + r)
+layout left:(layout left   + l)
-top:(layout top    + t)
+right:(layout right  + r)
-bottom:(layout bottom + b).
+top:(layout top    + t)
-] ifFalse:[     "POINT"
+bottom:(layout bottom + b).
-layout x:(layout x + l) y:(layout y + t).
+] ifFalse:[     "POINT"
-]
+layout x:(layout x + l) y:(layout y + t).
-].
+]
-aView geometryLayout:layout
+].
-]
+aView geometryLayout:layout
 !
 shiftLayout:aViewOrComponent vertical:n
 "shift layout for a view; in case of an open transaction, the undo action is registered"
 onView := aView.
 ! !
 !UIObjectView::ResizeData methodsFor:'accessing'!
+checkForChangeSelector
+^ checkForChangeSelector
+!
 delta
 ^ delta
 "Created: / 2.2.1998 / 13:40:32 / cg"
 !
 object
 ^ object
 "Created: / 2.2.1998 / 13:40:24 / cg"
+!
+object:anObject selector:selectorArg checkForChangeSelector:checkForChangeSelectorArg delta:anInteger
+object := anObject.
+selector := selectorArg.
+checkForChangeSelector := checkForChangeSelectorArg.
+delta := anInteger.
+"Created: / 2.2.1998 / 13:39:22 / cg"
 !
 object:anObject selector:aSymbol delta:anInteger
 object := anObject.
 selector := aSymbol.

changeset 2536	408cba0cbef4
parent 2535	961e4b080571
child 2538	ded6eb784054