hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:556bb6c9e36c
+:230fe13c4e51
 "
 COPYRIGHT (c) 1995 by eXept Software AG
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 !UIObjectView class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1995 by eXept Software AG
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 "
 buildIn view used by the UIPainter; it provides all services for creating, deleting
 moving and changing layouts of painted components on a canvas.
 [see also:]
-UIBuilder
+	UIBuilder
-UIPainterView
+	UIPainterView
 [author:]
-Claus Atzkern
+	Claus Atzkern
 "
 ! !
 !UIObjectView class methodsFor:'conversion'!
 type   := self layoutType:aView.
 layout := aView geometryLayout.
 layout isNil ifTrue:[
-type == #Extent ifTrue:[
+	type == #Extent ifTrue:[
-layout := aView bounds asLayout
+	    layout := aView bounds asLayout
-]
+	]
 ].
 (type isNil or:[layout isNil]) ifTrue:[
-^ nil
+	^ nil
 ].
 type == #LayoutFrame ifTrue:[
-^ layout copy
+	^ layout copy
 ].
 layout isLayout ifFalse:[
-type == #Rectangle ifTrue:[
+	type == #Rectangle ifTrue:[
-lO := layout left.
+	    lO := layout left.
-tO := layout top.
+	    tO := layout top.
-rO := layout right.
+	    rO := layout right.
-bO := layout bottom.
+	    bO := layout bottom.
-] ifFalse:[
+	] ifFalse:[
-lO := layout x.
+	    lO := layout x.
-tO := layout y.
+	    tO := layout y.
-rO := lO + aView extent x.
+	    rO := lO + aView extent x.
-bO := tO + aView extent y.
+	    bO := tO + aView extent y.
-].
+	].
-^ LayoutFrame leftFraction:0 offset:lO  rightFraction:0 offset:rO
+	^ LayoutFrame leftFraction:0 offset:lO  rightFraction:0 offset:rO
-topFraction:0 offset:tO bottomFraction:0 offset:bO
+		       topFraction:0 offset:tO bottomFraction:0 offset:bO
 ].
 lF := layout leftFraction.
 lO := layout leftOffset.
 tF := layout topFraction.
 bO := tO + aView extent y.
 rF := lF.
 rO := lO + aView extent x.
 newLyt := LayoutFrame leftFraction:lF offset:lO  rightFraction:rF offset:rO
-topFraction:tF offset:tO bottomFraction:bF offset:bO.
+			   topFraction:tF offset:tO bottomFraction:bF offset:bO.
 (    (type == #AlignmentOrigin)
 and:[layout leftAlignmentFraction ~~ 0
 or:[layout topAlignmentFraction  ~~ 0]]
 ) ifTrue:[
-|svRc prBd dlta|
+	|svRc prBd dlta|
-svRc := aView superView viewRectangle.
+	svRc := aView superView viewRectangle.
-prBd := aView preferredBounds.
+	prBd := aView preferredBounds.
-dlta := (  ((layout rectangleRelativeTo:svRc preferred:prBd) corner)
+	dlta := (  ((layout rectangleRelativeTo:svRc preferred:prBd) corner)
-- ((newLyt rectangleRelativeTo:svRc preferred:prBd) corner)
+		 - ((newLyt rectangleRelativeTo:svRc preferred:prBd) corner)
-) rounded.
+		) rounded.
-newLyt leftOffset:(lO + dlta x).
+	newLyt leftOffset:(lO + dlta x).
-newLyt rightOffset:(rO + dlta x).
+	newLyt rightOffset:(rO + dlta x).
-newLyt topOffset:(tO + dlta y).
+	newLyt topOffset:(tO + dlta y).
-newLyt bottomOffset:(bO + dlta y).
+	newLyt bottomOffset:(bO + dlta y).
 ].
 ^ newLyt.
 "Modified: 28.3.1997 / 19:52:48 / cg"
 ! !
 |type v h|
 type := self layoutType:aView.
 (type == #LayoutFrame or:[type == #Rectangle]) ifTrue:[
-v := self isVerticalResizable:aView.
+	v := self isVerticalResizable:aView.
-h := self isHorizontalResizable:aView.
+	h := self isHorizontalResizable:aView.
-h ifTrue:[  aBlock value:(aView leftCenter ) value:#left.
+	h ifTrue:[  aBlock value:(aView leftCenter ) value:#left.
-aBlock value:(aView rightCenter) value:#right.
+		    aBlock value:(aView rightCenter) value:#right.
-].
+		 ].
-v ifTrue:[  aBlock value:(aView topCenter   ) value:#top.
+	v ifTrue:[  aBlock value:(aView topCenter   ) value:#top.
-aBlock value:(aView bottomCenter) value:#bottom.
+		    aBlock value:(aView bottomCenter) value:#bottom.
-].
+		 ].
-(h and:[v]) ifTrue:[
+	(h and:[v]) ifTrue:[
-aBlock value:(aView origin    ) value:#origin.
+	    aBlock value:(aView origin    ) value:#origin.
-aBlock value:(aView topRight  ) value:#topRight.
+	    aBlock value:(aView topRight  ) value:#topRight.
-aBlock value:(aView bottomLeft) value:#bottomLeft.
+	    aBlock value:(aView bottomLeft) value:#bottomLeft.
-aBlock value:(aView corner    ) value:#corner.
+	    aBlock value:(aView corner    ) value:#corner.
-^ self
+	  ^ self
-]
+	]
 ].
 aBlock value:(aView origin    ) value:#view.
 aBlock value:(aView topRight  ) value:#view.
 aBlock value:(aView bottomLeft) value:#view.
 type == #Extent ifTrue:[
-v := self isVerticalResizable:aView.
+	v := self isVerticalResizable:aView.
-h := self isHorizontalResizable:aView.
+	h := self isHorizontalResizable:aView.
-v ifTrue:[aBlock value:(aView bottomCenter) value:#bottom].
+	v ifTrue:[aBlock value:(aView bottomCenter) value:#bottom].
-h ifTrue:[aBlock value:(aView rightCenter ) value:#right ].
+	h ifTrue:[aBlock value:(aView rightCenter ) value:#right ].
-(h and:[v]) ifTrue:[
+	(h and:[v]) ifTrue:[
-aBlock value:(aView corner) value:#corner.
+	    aBlock value:(aView corner) value:#corner.
-^ self
+	  ^ self
-]
+	]
 ].
 aBlock value:(aView corner) value:#view.
 ! !
 isHorizontalResizable:aComponent
 "returns true if instance is horizontal resizeable
 "
 (aComponent isKindOf:ScrollBar) ifTrue:[
-^ aComponent orientation == #horizontal
+	^ aComponent orientation == #horizontal
 ].
 (aComponent isKindOf:Scroller) ifTrue:[
-^ aComponent orientation == #horizontal
+	^ aComponent orientation == #horizontal
 ].
 (aComponent isKindOf:Slider) ifTrue:[
-^ aComponent orientation == #horizontal
+	^ aComponent orientation == #horizontal
 ].
 ^ true
 !
 isVerticalResizable:aComponent
 "returns true if instance is vertical resizeable
 "
 (aComponent isKindOf:EditField) ifTrue:[
-^ false
+	^ false
 ].
 (aComponent isKindOf:ComboBoxView) ifTrue:[
-^ false
+	^ false
 ].
 (aComponent isKindOf:CheckBox) ifTrue:[
-^ false
+	^ false
 ].
 (aComponent isKindOf:ScrollBar) ifTrue:[
-^ aComponent orientation == #vertical
+	^ aComponent orientation == #vertical
 ].
 (aComponent isKindOf:Scroller) ifTrue:[
-^ aComponent orientation == #vertical
+	^ aComponent orientation == #vertical
 ].
 (aComponent isKindOf:Slider) ifTrue:[
-^ aComponent orientation == #vertical
+	^ aComponent orientation == #vertical
 ].
 ^ true
 !
 "returns layout type of aView or nil
 "
 |layout spec superView|
 aView notNil ifTrue:[
-layout := aView geometryLayout.
+	layout := aView geometryLayout.
-layout notNil ifTrue:[
+	layout notNil ifTrue:[
-layout isLayout ifTrue:[
+	    layout isLayout ifTrue:[
-layout isLayoutFrame        ifTrue:[ ^ #LayoutFrame ].
+		layout isLayoutFrame        ifTrue:[ ^ #LayoutFrame ].
-layout isAlignmentOrigin    ifTrue:[ ^ #AlignmentOrigin ].
+		layout isAlignmentOrigin    ifTrue:[ ^ #AlignmentOrigin ].
-layout isLayoutOrigin       ifTrue:[ ^ #LayoutOrigin ].
+		layout isLayoutOrigin       ifTrue:[ ^ #LayoutOrigin ].
-] ifFalse:[
+	    ] ifFalse:[
-layout isRectangle          ifTrue:[ ^ #Rectangle ].
+		layout isRectangle          ifTrue:[ ^ #Rectangle ].
-layout isPoint              ifTrue:[ ^ #Point ].
+		layout isPoint              ifTrue:[ ^ #Point ].
-]
+	    ]
-] ifFalse:[
+	] ifFalse:[
-(superView := aView superView) notNil ifTrue:[
+	    (superView := aView superView) notNil ifTrue:[
-spec := superView specClass.
+		spec := superView specClass.
-spec canResizeSubComponents ifTrue:[
+		spec canResizeSubComponents ifTrue:[
-^ #Extent
+		    ^ #Extent
-]
+		]
-]
+	    ]
-]
+	]
 ].
 ^ nil
 "Modified: 28.2.1997 / 13:02:16 / cg"
 ! !
 gridAlign:aBool
 "change state of aligning to grid
 "
 aBool ifTrue:[self alignOn]
-ifFalse:[self alignOff]
+	 ifFalse:[self alignOff]
 !
 gridParameters
 "used by defineGrid, and in a separate method for
 easier redefinition in subclasses.
 Returns the grid parameters in an array of 7 elements,
 which control the appearance of the grid-pattern.
 the elements are:
-bigStepH        number of pixels horizontally between 2 major steps
+	bigStepH        number of pixels horizontally between 2 major steps
-bigStepV        number of pixels vertically between 2 major steps
+	bigStepV        number of pixels vertically between 2 major steps
-littleStepH     number of pixels horizontally between 2 minor steps
+	littleStepH     number of pixels horizontally between 2 minor steps
-littleStepV     number of pixels vertically between 2 minor steps
+	littleStepV     number of pixels vertically between 2 minor steps
-gridAlignH      number of pixels for horizontal grid align (pointer snap)
+	gridAlignH      number of pixels for horizontal grid align (pointer snap)
-gridAlignV      number of pixels for vertical grid align (pointer snap)
+	gridAlignV      number of pixels for vertical grid align (pointer snap)
-docBounds       true, if document boundary should be shown
+	docBounds       true, if document boundary should be shown
 if littleStepH/V are nil, only bigSteps are drawn.
 "
 gridParameters isNil ifTrue:[
-gridParameters := #(10 10 nil nil 10 10 false)
+	gridParameters := #(10 10 nil nil 10 10 false)
 ].
 ^ gridParameters
 !
 easier redefinition in subclasses.
 Returns the grid parameters in an array of 7 elements,
 which control the appearance of the grid-pattern.
 the elements are:
-bigStepH        number of pixels horizontally between 2 major steps
+	bigStepH        number of pixels horizontally between 2 major steps
-bigStepV        number of pixels vertically between 2 major steps
+	bigStepV        number of pixels vertically between 2 major steps
-littleStepH     number of pixels horizontally between 2 minor steps
+	littleStepH     number of pixels horizontally between 2 minor steps
-littleStepV     number of pixels vertically between 2 minor steps
+	littleStepV     number of pixels vertically between 2 minor steps
-gridAlignH      number of pixels for horizontal grid align (pointer snap)
+	gridAlignH      number of pixels for horizontal grid align (pointer snap)
-gridAlignV      number of pixels for vertical grid align (pointer snap)
+	gridAlignV      number of pixels for vertical grid align (pointer snap)
-docBounds       true, if document boundary should be shown
+	docBounds       true, if document boundary should be shown
 if littleStepH/V are nil, only bigSteps are drawn.
 "
 newGridParameters size == 7 ifTrue:[
-gridParameters := newGridParameters
+	gridParameters := newGridParameters
 ].
 !
 gridShown:aBool
 "change visibility of grid
 "
 aBool ifTrue:[self showGrid]
-ifFalse:[self hideGrid]
+	 ifFalse:[self hideGrid]
 !
 hideGrid
 "hide grid
 "
 gridShown ifTrue:[
-self withSelectionHiddenDo:[super hideGrid]
+	self withSelectionHiddenDo:[super hideGrid]
 ]
 !
 enableStateChanged
 "set the modification / test mode
 "
 self shown ifTrue:[
-enableChannel value ifFalse:[
+	enableChannel value ifFalse:[
-saveSelection := selection.
+	    saveSelection := selection.
-self hideSelection.
+	    self hideSelection.
-selection := nil.
+	    selection := nil.
-inputView unmap.
+	    inputView unmap.
-] ifTrue:[
+	] ifTrue:[
-inputView raise.
+	    inputView raise.
-inputView realize.
+	    inputView realize.
-selection := saveSelection.
+	    selection := saveSelection.
-self showSelection
+	    self showSelection
-]
+	]
 ]
 "Created: / 30.3.1999 / 16:17:24 / stefan"
 !
 |spv|
 spv := self findContainerOfView:aView.
 selectionHiddenLevel ~~ 0 ifTrue:[setOfSuperViewsSizeChanged add:spv]
-ifFalse:[spv sizeChanged:nil]
+			     ifFalse:[spv sizeChanged:nil]
 !
 exposeX:x y:y width:w height:h
 "handle an expose event from device; redraw selection
 "
 resizeData isNil ifTrue:[
-super exposeX:x y:y width:w height:h.
+	super exposeX:x y:y width:w height:h.
-"/ handle any expose events (for subcomponents) before
+	"/ handle any expose events (for subcomponents) before
-"/ redrawing the handles.
+	"/ redrawing the handles.
-(self sensor hasExposeEventFor:nil) ifTrue:[^ self].
+	(self sensor hasExposeEventFor:nil) ifTrue:[^ self].
-self selectionDo:[:aComponent |
+	self selectionDo:[:aComponent |
-aComponent withAllSubViewsDo:[:v |
+	    aComponent withAllSubViewsDo:[:v |
-self sensor flushExposeEventsFor:v.
+		v realized ifTrue:[
-v exposeX:0 y:0 width:v width height:v height.
+		    self sensor flushExposeEventsFor:v.
-].
+		    v exposeX:0 y:0 width:v width height:v height.
-self showSelected:aComponent
+		]
-]
+	    ].
+	    self showSelected:aComponent
+	]
 ].
 "Modified: / 9.11.1998 / 12:50:34 / cg"
 !
 keyPress:key x:x y:y
 "any key pressed
 "
 <resource: #keyboard ( #CursorUp #CursorDown #CursorLeft #CursorRight
-#Delete #BackSpace #Cut #Copy #Paste #Cmdu ) >
+			   #Delete #BackSpace #Cut #Copy #Paste #Cmdu ) >
 (key == #Cut or:[key == #Delete or:[key == #BackSpace]]) ifTrue: [
-^ self deleteSelection
+	^ self deleteSelection
 ].
 key == #Copy  ifTrue:[ ^ self copySelection].
 key == #Paste ifTrue:[ ^ self pasteBuffer].
 key == #Cmdu  ifTrue:[ ^ self undoLast ].           "/ #Undo
 processEvent:anEvent
 "catch expose events for components, and redraw its handles after
 the redraw when this happens
 "
 (anEvent type == #damage and:[self isSelected:(anEvent view)]) ifTrue:[
-self showSelected:(anEvent view)
+	self showSelected:(anEvent view)
 ].
 ^ false.
 !
 sizeChanged:how
 "size of a view(s) changed
 "
 self withSelectionHiddenDo:[
-super sizeChanged:how
+	super sizeChanged:how
 ]
 ! !
 self enableChannel:(true asValue).
 clipChildren         := true.
 selectionHiddenLevel := 0.
 (self class gridShown) ifTrue:[
-super showGrid
+	super showGrid
 ].
 "Modified: / 20.7.1998 / 18:14:51 / cg"
 "Modified: / 30.3.1999 / 16:19:15 / stefan"
 !
 cursor:aCursor
 "set cursor
 "
 inputView realized ifTrue:[
-inputView cursor:aCursor
+	inputView cursor:aCursor
 ].
 super cursor:aCursor
 !
 "invert outline of an object or collection of objects
 "
 |wasClipped|
 (wasClipped := clipChildren) ifTrue:[
-self clippedByChildren:(clipChildren := false).
+	self clippedByChildren:(clipChildren := false).
 ].
 self xoring:[
-|p|
+	|p|
-something isCollection ifTrue:[
+	something isCollection ifTrue:[
-something do:[:v |
+	    something do:[:v |
-|p|
+		|p|
-p := v originRelativeTo:self.
+		p := v originRelativeTo:self.
-self displayRectangle:(p extent:v extent).
+		self displayRectangle:(p extent:v extent).
-].
+	    ].
-] ifFalse:[
+	] ifFalse:[
-|p|
+	    |p|
-p := something originRelativeTo:self.
+	    p := something originRelativeTo:self.
-self displayRectangle:(p extent:something extent).
+	    self displayRectangle:(p extent:something extent).
-]
+	]
 ].
 wasClipped ifTrue:[
-self clippedByChildren:(clipChildren := true).
+	self clippedByChildren:(clipChildren := true).
 ].
 !
 minSetOfSuperViews:setOfViews
 setOfViews isCollection ifFalse:[
-setOfViews notNil ifTrue:[^ Array with:setOfViews]
+	setOfViews notNil ifTrue:[^ Array with:setOfViews]
-ifFalse:[^ nil]
+			 ifFalse:[^ nil]
 ].
 ^ setOfViews select:[:aView|
-(setOfViews detect:[:v|aView isComponentOf:v] ifNone:nil) isNil
+	(setOfViews detect:[:v|aView isComponentOf:v] ifNone:nil) isNil
 ]
 !
 redrawObjectsInVisible:redrawFrame
 "my objects are views - they redraw themself"
 doObjectMove:aPoint
 "move selection
 "
 movedObject notNil ifTrue:[
-self invertOutlineOf:movedObject.
+	self invertOutlineOf:movedObject.
-movedObject keysAndValuesDo:[:i :v|
+	movedObject keysAndValuesDo:[:i :v|
-self moveObject:v to:(aPoint - (moveDelta at:i)).
+	    self moveObject:v to:(aPoint - (moveDelta at:i)).
-].
+	].
-self invertOutlineOf:movedObject.
+	self invertOutlineOf:movedObject.
 ]
 !
 endObjectMove
 "cleanup after object(s) move
 "
 movedObject notNil ifTrue:[
-self invertOutlineOf:movedObject.
+	self invertOutlineOf:movedObject.
-movedObject size == 1 ifTrue:[
+	movedObject size == 1 ifTrue:[
-movedObject := movedObject first
+	    movedObject := movedObject first
-].
+	].
-self setSelection:movedObject withRedraw:true.
+	self setSelection:movedObject withRedraw:true.
-movedObject := nil.
+	movedObject := nil.
-self setDefaultActions.
+	self setDefaultActions.
-self layoutChanged.
+	self layoutChanged.
 ].
 !
 moveObject:anObject to:aPoint
 "move anObject to newOrigin, aPoint
 "
 |dX dY org delta|
 anObject notNil ifTrue:[
-org := anObject computeOrigin.
+	org := anObject computeOrigin.
-delta := aPoint - org.
+	delta := aPoint - org.
-delta := (self alignToGrid:aPoint) - org.
+	delta := (self alignToGrid:aPoint) - org.
-dX := delta x.
+	dX := delta x.
-dY := delta y.
+	dY := delta y.
-undoHistory withoutTransactionDo:[
+	undoHistory withoutTransactionDo:[
-self shiftLayout:anObject top:dY bottom:dY left:dX right:dX
+	    self shiftLayout:anObject top:dY bottom:dY left:dX right:dX
-]
+	]
 ]
 !
 startObjectMoveAt:aPoint
 "
 self startObjectMove:(self selection) at:aPoint.
 movedObject := self selection.
 movedObject isCollection ifFalse:[
-movedObject := Array with:movedObject
+	movedObject := Array with:movedObject
 ].
 self setSelection:nil withRedraw:true.
 moveDelta := movedObject collect:[:aView|
-aPoint - aView computeOrigin
+	aPoint - aView computeOrigin
 ].
 self transaction:#move objects:movedObject do:[:v|self createUndoLayout:v].
 self invertOutlineOf:movedObject.
 !
 self enabled ifFalse:[^ self].
 anObject := self findObjectAt:aPoint.
 anObject notNil ifTrue:[
-(self isSelected:anObject) ifTrue:[
+	(self isSelected:anObject) ifTrue:[
-self removeFromSelection:anObject
+	    self removeFromSelection:anObject
-] ifFalse:[
+	] ifFalse:[
-self addToSelection:anObject
+	    self addToSelection:anObject
-]
+	]
 ]
 !
 startSelectOrMove:aPoint
 "a button is pressed at a point; start moving or selection
 self enabled ifFalse:[^ self].
 aView := self singleSelection.
 aView notNil ifTrue:[
-v := self findContainerOfView:aView.
+	v := self findContainerOfView:aView.
-v specClass canResizeSubComponents ifTrue:[
+	v specClass canResizeSubComponents ifTrue:[
-b := self whichHandleOf:aView isHitBy:aPoint.
+	    b := self whichHandleOf:aView isHitBy:aPoint.
-(b notNil and:[b ~~ #view]) ifTrue:[
+	    (b notNil and:[b ~~ #view]) ifTrue:[
-^ self startResizeBorder:b of:aView.
+		^ self startResizeBorder:b of:aView.
-]
+	    ]
-].
+	].
-(self sensor ctrlDown and:[self canChangeLayoutOfView:aView]) ifFalse:[
+	(self sensor ctrlDown and:[self canChangeLayoutOfView:aView]) ifFalse:[
-aView := nil
+	    aView := nil
-]
+	]
 ].
 aView isNil ifTrue:[
-(aView := self findObjectAt:aPoint) isNil ifTrue:[
+	(aView := self findObjectAt:aPoint) isNil ifTrue:[
-^ self select:nil
+	    ^ self select:nil
-].
+	].
-(self canChangeLayoutOfView:aView) ifFalse:[
+	(self canChangeLayoutOfView:aView) ifFalse:[
-^ self select:aView
+	    ^ self select:aView
-]
+	]
 ].
 (self isSelected:aView) ifFalse:[
-self select:aView.
+	self select:aView.
 ].
 (self numberOfSelections ~~ 1) ifTrue:[
-releaseAction := [
+	releaseAction := [
-self setDefaultActions.
+	    self setDefaultActions.
-self select:aView
+	    self select:aView
-]
+	]
 ] ifFalse:[
-releaseAction := [self setDefaultActions]
+	releaseAction := [self setDefaultActions]
 ].
 "prepare move operation for an object
 "
 motionAction := [:movePoint|
-(aPoint dist:movePoint) > 8.0 ifTrue:[
+	(aPoint dist:movePoint) > 8.0 ifTrue:[
-self startObjectMoveAt:aPoint
+	    self startObjectMoveAt:aPoint
-]
+	]
 ].
 ! !
 !UIObjectView methodsFor:'object resize'!
 delta    := anObject container originRelativeTo:self.
 selector := ('resize:', aSelector, ':') asSymbol.
 resizeData := ResizeData new
-object:anObject selector:selector delta:delta.
+		      object:anObject selector:selector delta:delta.
 "can change cursor dependent on vertical/horizontal resizing
 "
 oldCursor := cursor.
 self cursor:(Cursor leftHand).
 "/ handle any expose events (for subcomponents) before
 "/ redrawing the handles.
 Delay waitForSeconds:0.05.
 [self sensor hasExposeEventFor:nil] whileTrue:[
-self windowGroup processExposeEvents
+	self windowGroup processExposeEvents
 ].
 self setSelection:object withRedraw:true.
 self layoutChanged.
 !
 object := self singleSelection.
 self actionResize:object selector:b.
 self transaction:#resize selectionDo:[:aView|
-self createUndoLayout:aView
+	self createUndoLayout:aView
 ].
 self setSelection:nil withRedraw:true.
 motionAction  := [:movePoint | self doDragResize:movePoint].
 releaseAction := [self endResize].
 "update affected views
 "
 |c|
 self forEach:aViewOrSeqOfViews do:[:v|
-v shown ifTrue:[
+	v shown ifTrue:[
-v fill:v viewBackground.
+	    v fill:v viewBackground.
-v borderWidth ~~ 0 ifTrue:[
+	    v borderWidth ~~ 0 ifTrue:[
-c := v borderColor.
+		c := v borderColor.
-v borderColor:(Color colorId:1).
+		v borderColor:(Color colorId:1).
-v borderColor:c.
+		v borderColor:c.
-].
+	    ].
-v exposeX:0 y:0 width:(v width) height:(v height)
+	    v exposeX:0 y:0 width:(v width) height:(v height)
-]
+	]
 ]
 "Modified: / 16.9.1998 / 01:40:30 / cg"
 !
 dlt := (aComponent originRelativeTo:self) - aComponent origin.
 dlt := dlt - (3@3).
 ext := 6@6.
 self class handlesOf:aComponent do:[:pnt :wht |
-aTwoArgAction value:(pnt + dlt extent:ext) value:wht
+	aTwoArgAction value:(pnt + dlt extent:ext) value:wht
 ]
 !
 showUnselected:aComponent
 "show object unselected
 "/    ].
 "/    v destroy.
 "/    ^ self.
 (wasClipped := clipChildren) ifTrue:[
-self clippedByChildren:(clipChildren := false).
+	self clippedByChildren:(clipChildren := false).
 ].
 self handlesOf:aComponent do:[:rec :wht| self clearRectangle:rec ].
 wasClipped ifTrue:[
-self clippedByChildren:(clipChildren := true).
+	self clippedByChildren:(clipChildren := true).
 ].
 "/ must redraw all components which are affected b the handles
 r := (aComponent originRelativeTo:self) - (3@3) extent:(aComponent extent + (6@6)).
 subViews do:[:anotherComponent |
-|absOrg absFrame|
+	|absOrg absFrame|
-anotherComponent ~~ inputView ifTrue:[
+	anotherComponent ~~ inputView ifTrue:[
-absOrg := anotherComponent originRelativeTo:self.
+	    absOrg := anotherComponent originRelativeTo:self.
-absFrame := absOrg extent:(anotherComponent extent).
+	    absFrame := absOrg extent:(anotherComponent extent).
-(absFrame intersects:r) ifTrue:[
+	    (absFrame intersects:r) ifTrue:[
-anotherComponent withAllSubViewsDo:[:v |
+		anotherComponent withAllSubViewsDo:[:v |
-v shown ifTrue:[
+		    v shown ifTrue:[
-aSet notNil ifTrue:[
+			aSet notNil ifTrue:[
-aSet add:v
+			    aSet add:v
-] ifFalse:[
+			] ifFalse:[
-self handleAffectedViews:v
+			    self handleAffectedViews:v
-]
+			]
-]
+		    ]
-]
+		]
-]
+	    ]
-]
+	]
 ].
 "Modified: / 24.8.1998 / 12:19:38 / cg"
 !
 whichHandleOf:aComponent isHitBy:aPoint
 "returns kind of handle or nil
 "
 self handlesOf:aComponent do:[:rectangle :what|
-(rectangle containsPoint:aPoint) ifTrue:[^ what]
+	(rectangle containsPoint:aPoint) ifTrue:[^ what]
 ].
 ^ nil
 ! !
 !UIObjectView methodsFor:'private resizing-subviews'!
 resize:aView bottom:aPoint
 "resize a views bottom
 "
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
+	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
+	self shiftLayout:aView top:0
-bottom:((aPoint y) - (aView computeCorner y))
+			    bottom:((aPoint y) - (aView computeCorner y))
-left:((aPoint x) - (aView computeOrigin x))
+			      left:((aPoint x) - (aView computeOrigin x))
-right:0
+			     right:0
 ]
 !
 |delta|
 delta := aPoint - aView computeCorner.
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:0 bottom:(delta y) left:0 right:(delta x)
+	self shiftLayout:aView top:0 bottom:(delta y) left:0 right:(delta x)
 ]
 !
 resize:aView left:aPoint
 "resize a views left
 "
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView left:((aPoint x) - (aView computeOrigin x)) right:0
+	self shiftLayout:aView left:((aPoint x) - (aView computeOrigin x)) right:0
 ]
 !
 resize:aView origin:aPoint
 |delta|
 delta := aPoint - aView computeOrigin.
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:(delta y) bottom:0 left:(delta x) right:0
+	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))
+	self shiftLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
 ]
 !
 resize:aView top:aPoint
 "resize a views top
 "
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y)) bottom:0
+	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))
+	self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y))
-bottom:0
+			    bottom:0
-left:0
+			      left:0
-right:((aPoint x) - (aView computeCorner x))
+			     right:((aPoint x) - (aView computeCorner x))
 ]
 ! !
 |type layout oldExt|
 type := self class layoutType:aView.
 type notNil ifTrue:[
-self createUndoLayout:aView.
+	self createUndoLayout:aView.
-type == #Extent ifTrue:[
+	type == #Extent ifTrue:[
-oldExt := aView extent.
+	    oldExt := aView extent.
-aView extent:(oldExt + ((r-l) @ (b-t))).
+	    aView extent:(oldExt + ((r-l) @ (b-t))).
-^ self
+	    ^ self
-].
+	].
-layout := aView geometryLayout copy.
+	layout := aView geometryLayout copy.
-layout isLayout ifTrue:[
+	layout isLayout ifTrue:[
-layout leftOffset:(layout leftOffset + l)
+	    layout leftOffset:(layout leftOffset + l)
-topOffset:(layout topOffset  + t).
+		    topOffset:(layout topOffset  + t).
-type == #LayoutFrame ifTrue:[
+	    type == #LayoutFrame ifTrue:[
-layout bottomOffset:(layout bottomOffset + b).
+		layout bottomOffset:(layout bottomOffset + b).
-layout  rightOffset:(layout rightOffset  + r).
+		layout  rightOffset:(layout rightOffset  + r).
-]
+	    ]
-] ifFalse:[
+	] ifFalse:[
-type == #Rectangle ifTrue:[
+	    type == #Rectangle ifTrue:[
-layout left:(layout left   + l)
+		layout left:(layout left   + l)
-right:(layout right  + r)
+		      right:(layout right  + r)
-top:(layout top    + t)
+			top:(layout top    + t)
-bottom:(layout bottom + b).
+		     bottom:(layout bottom + b).
-] ifFalse:[     "POINT"
+	    ] ifFalse:[     "POINT"
-layout x:(layout x + l) y:(layout y + t).
+		layout x:(layout x + l) y:(layout y + t).
-]
+	    ]
-].
+	].
-aView geometryLayout:layout
+	aView geometryLayout:layout
 ]
 ! !
 !UIObjectView methodsFor:'searching'!
 point  := aPoint + (device translatePoint:0@0 from:(self id) to:viewId).
 inputView lower.
 [viewId notNil] whileTrue:[
-lastId := viewId.
+	lastId := viewId.
-viewId := device viewIdFromPoint:point in:lastId
+	viewId := device viewIdFromPoint:point in:lastId
 ].
 inputView raise.
 view := device viewFromId:lastId.
 "/ look for 'hidden' views ...
 listOfViews := OrderedCollection new.
 self allSubViewsDo:[:aView |
-|org|
+	|org|
-aView ~~ inputView ifTrue:[
+	aView ~~ inputView ifTrue:[
-org := device translatePoint:0@0 from:(aView id) to:self id.
+	    org := device translatePoint:0@0 from:(aView id) to:self id.
-((org extent:aView extent) containsPoint:aPoint) ifTrue:[
+	    ((org extent:aView extent) containsPoint:aPoint) ifTrue:[
-listOfViews add:aView.
+		listOfViews add:aView.
-]
+	    ]
-]
+	]
 ].
 listOfViews size > 0 ifTrue:[
-^ listOfViews last
+	^ listOfViews last
 ].
 ^ nil
 ! !
 "hide the selection - undraw hilights - whatever that is"
 |aSet|
 self selectionDo:[:object|
-aSet isNil ifTrue:[
+	aSet isNil ifTrue:[
-aSet := IdentitySet new
+	    aSet := IdentitySet new
-].
+	].
-self showUnselected:object addAffectedViewsTo:aSet.
+	self showUnselected:object addAffectedViewsTo:aSet.
 ].
 self handleAffectedViews:aSet.
 !
 can be moved. If true the selection is returned otherwise nil
 "
 |coll|
 self hasSelection ifTrue:[
-(self canMove:(coll := self selection)) ifTrue:[
+	(self canMove:(coll := self selection)) ifTrue:[
-^ coll
+	    ^ coll
-]
+	]
 ].
 ^ nil
 !
 numberOfSelections
 showSelection
 "show the selection - draw handles
 "
 selectionHiddenLevel == 0 ifTrue:[
-self selectionDo:[:el| self showSelected:el ]
+	self selectionDo:[:el| self showSelected:el ]
 ].
 !
 singleSelection
 "checks whether one element is selected; in this case the element is
 returned otherwise nil
 "
 |coll|
 (coll := self selection) isCollection ifFalse:[
-^ coll
+	^ coll
 ].
 coll size == 1 ifTrue:[ ^ coll first].
 ^ nil
 !
 with argument the selected instance will be processed
 "
 |view|
 (view := self singleSelection) notNil ifTrue:[
-aBlock value:view
+	aBlock value:view
 ]
 !
 unselect
 "clear selection
 "apply block with selection hidden (no handles)
 "
 |coll|
 selectionHiddenLevel == 0 ifTrue:[
-self hideSelection.
+	self hideSelection.
-device flush.
+	device flush.
 ].
 selectionHiddenLevel := selectionHiddenLevel + 1.
 aBlock valueNowOrOnUnwindDo:[
-selectionHiddenLevel == 1 ifTrue:[
+	selectionHiddenLevel == 1 ifTrue:[
-setOfSuperViewsSizeChanged notEmpty ifTrue:[
+	    setOfSuperViewsSizeChanged notEmpty ifTrue:[
-coll := self minSetOfSuperViews:setOfSuperViewsSizeChanged.
+		coll := self minSetOfSuperViews:setOfSuperViewsSizeChanged.
-coll do:[:aView| aView sizeChanged:nil].
+		coll do:[:aView| aView sizeChanged:nil].
-setOfSuperViewsSizeChanged := IdentitySet new
+		setOfSuperViewsSizeChanged := IdentitySet new
-].
+	    ].
-selectionHiddenLevel := 0.
+	    selectionHiddenLevel := 0.
-self selectionDo:[:aView| self showSelected:aView].
+	    self selectionDo:[:aView| self showSelected:aView].
-] ifFalse:[
+	] ifFalse:[
-selectionHiddenLevel := selectionHiddenLevel - 1.
+	    selectionHiddenLevel := selectionHiddenLevel - 1.
-]
+	]
 ]
 !
 withoutSelectionDo:aBlock
 "evaluate aBlock while selection is nilled
 "
 |sel|
 self hasSelection ifFalse:[
-aBlock value
+	aBlock value
 ] ifTrue:[
-sel := self selection.
+	sel := self selection.
-self setSelection:nil withRedraw:true.
+	self setSelection:nil withRedraw:true.
-aBlock value.
+	aBlock value.
-self setSelection:sel withRedraw:true.
+	self setSelection:sel withRedraw:true.
 ]
 ! !
 "set a new selection without change notifications
 "
 |sel|
 (sel := aNewSelection) == self ifTrue:[
-sel := nil
+	sel := nil
 ].
 doRedraw ifTrue:[
-self hideSelection.
+	self hideSelection.
-selection := sel.
+	selection := sel.
-self showSelection
+	self showSelection
 ] ifFalse:[
-selection := sel
+	selection := sel
 ]
 ! !
 !UIObjectView methodsFor:'testing'!
 isSelected:anObject
 "return true, if the argument, anObject is selected
 "
 anObject notNil ifTrue:[
-self selectionDo:[:el| el == anObject ifTrue:[^ true]]
+	self selectionDo:[:el| el == anObject ifTrue:[^ true]]
 ].
 ^ false
 ! !
 |object|
 object := self singleSelection.
 object notNil ifTrue:[
-copiedExtent := object computeExtent
+	copiedExtent := object computeExtent
 ] ifFalse:[
-self warn:'exactly one element must be selected'.
+	self warn:'exactly one element must be selected'.
 ]
 !
 |object|
 object := self singleSelection.
 object notNil ifTrue:[
-copiedLayout := object geometryLayout copy
+	copiedLayout := object geometryLayout copy
 ] ifFalse:[
-self warn:'exactly one element must be selected'.
+	self warn:'exactly one element must be selected'.
 ]
 !
 pasteExtent
 "paste the copied extent to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transaction:#pasteExtent dimensionDo:[:v|
+	self transaction:#pasteExtent dimensionDo:[:v|
-self resize:v corner:(v computeOrigin + copiedExtent)
+	    self resize:v corner:(v computeOrigin + copiedExtent)
-]
+	]
 ]
 !
 pasteHeight
 "paste the copied extent height to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transaction:#pasteHeight dimensionDo:[:v|
+	self transaction:#pasteHeight dimensionDo:[:v|
-self resize:v bottom:(v computeOrigin + copiedExtent)
+	    self resize:v bottom:(v computeOrigin + copiedExtent)
-]
+	]
 ]
 !
 pasteLayout
 "paste layout to all objects in the selection
 "
 copiedLayout notNil ifTrue:[
-self transaction:#pasteLayout dimensionDo:[:v|
+	self transaction:#pasteLayout dimensionDo:[:v|
-v geometryLayout:(copiedLayout copy)
+	    v geometryLayout:(copiedLayout copy)
-]
+	]
 ]
 !
 pasteWidth
 "paste the copied extent width to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transaction:#pasteWidth dimensionDo:[:v|
+	self transaction:#pasteWidth dimensionDo:[:v|
-self resize:v right:(v computeOrigin + copiedExtent)
+	    self resize:v right:(v computeOrigin + copiedExtent)
-]
+	]
 ]
 !
 setExtent:anExtent
 "change extent for all selected objects
 "
 self transaction:#extent dimensionDo:[:v|
-v geometryLayout:nil.
+	v geometryLayout:nil.
-v extent:anExtent.
+	v extent:anExtent.
 ].
 "Modified: 28.2.1997 / 12:49:00 / cg"
 !
 setLayout:aLayout
 "change layout for all selected objects
 "
 self transaction:#layout dimensionDo:[:v|
-v geometryLayout:(aLayout copy)
+	v geometryLayout:(aLayout copy)
 ].
 !
 setMaxExtent
 setToDefaultExtent
 "change extent of all selected views to their default extent
 "
 self transaction:#defaultExtent dimensionDo:[:v|
-self resize:v corner:(v computeOrigin + (v preferredExtent)).
+	self resize:v corner:(v computeOrigin + (v preferredExtent)).
 ]
 !
 setToDefaultHeight
 "change height of all selected views to their default height
 "
 self transaction:#defaultHeight dimensionDo:[:v|
-self resize:v bottom:(v computeOrigin + (v preferredExtent))
+	self resize:v bottom:(v computeOrigin + (v preferredExtent))
 ]
 !
 setToDefaultWidth
 "change width of all selected views to their default width
 "
 self transaction:#defaultWidth dimensionDo:[:v|
-self resize:v right:(v computeOrigin + (v preferredExtent))
+	self resize:v right:(v computeOrigin + (v preferredExtent))
 ]
 !
 transaction:aType dimensionDo:aOneArgBlock
 "change dimension within a transaction for the selected elements by evaluating
 the block with the argument a view.
 "
 self withSelectionHiddenDo:[
-self transaction:aType selectionDo:[:aView|
+	self transaction:aType selectionDo:[:aView|
-(self class layoutType:aView) notNil ifTrue:[
+	    (self class layoutType:aView) notNil ifTrue:[
-self createUndoLayout:aView.
+		self createUndoLayout:aView.
-aOneArgBlock value:aView.
+		aOneArgBlock value:aView.
-self elementChangedSize:aView.
+		self elementChangedSize:aView.
-]
+	    ]
-]
+	]
 ].
 self layoutChanged
 ! !
 "perform a move operation
 "
 |sensor tm|
 self moveableSelection isNil ifTrue:[
-^ self
+	^ self
 ].
 sensor := self sensor.
 tm := 0.15.
 self withSelectionHiddenDo:[
-self transaction:#move selectionDo:[:aView|self createUndoLayout:aView].
+	self transaction:#move selectionDo:[:aView|self createUndoLayout:aView].
-[
+	[
-self selectionDo:[:aView| aOneArgBlock value:aView ].
+	    self selectionDo:[:aView| aOneArgBlock value:aView ].
-Delay waitForSeconds:tm.
+	    Delay waitForSeconds:tm.
-tm := 0.02.
+	    tm := 0.02.
-self layoutChanged.
+	    self layoutChanged.
-sensor leftButtonPressed.
+	    sensor leftButtonPressed.
-] whileTrue.
+	] whileTrue.
-"/ handle any expose events (for subcomponents) before
+	"/ handle any expose events (for subcomponents) before
-"/ redrawing the handles.
+	"/ redrawing the handles.
-Delay waitForSeconds:0.05.
+	Delay waitForSeconds:0.05.
-[self sensor hasExposeEventFor:nil] whileTrue:[
+	[self sensor hasExposeEventFor:nil] whileTrue:[
-self windowGroup processExposeEvents
+	    self windowGroup processExposeEvents
-]
+	]
 ].
 !
 moveSelectionDown
 "move selection down
 "
 |gridY n|
 gridAlign notNil ifTrue:[gridY := gridAlign y]
-ifFalse:[gridY := 1].
+		    ifFalse:[gridY := 1].
 self moveDo:[:aView|
-aligning ifTrue:[
+	aligning ifTrue:[
-n := ((aView computeCorner y) \\ gridY).
+	    n := ((aView computeCorner y) \\ gridY).
-n ~~ 0 ifTrue:[
+	    n ~~ 0 ifTrue:[
-n := gridY - n + 1.
+		n := gridY - n + 1.
-] ifFalse:[
+	    ] ifFalse:[
-n := gridY
+		n := gridY
-]
+	    ]
-] ifFalse:[
+	] ifFalse:[
-n := 1
+	    n := 1
-].
+	].
-self shiftLayout:aView top:n bottom:n
+	self shiftLayout:aView top:n bottom:n
 ]
 !
 moveSelectionLeft
 "move selection left
 "
 |gridX n|
 gridAlign notNil ifTrue:[gridX := gridAlign x]
-ifFalse:[gridX := 1].
+		    ifFalse:[gridX := 1].
 self moveDo:[:aView|
-aligning ifTrue:[
+	aligning ifTrue:[
-n := ((aView computeOrigin x) \\ gridX).
+	    n := ((aView computeOrigin x) \\ gridX).
-n == 0 ifTrue:[n := gridX].
+	    n == 0 ifTrue:[n := gridX].
-n := n negated.
+	    n := n negated.
-] ifFalse:[
+	] ifFalse:[
-n := -1
+	    n := -1
-].
+	].
-self shiftLayout:aView left:n right:n
+	self shiftLayout:aView left:n right:n
 ]
 !
 moveSelectionRight
 "move selection right
 "
 |gridX n|
 gridAlign notNil ifTrue:[gridX := gridAlign x]
-ifFalse:[gridX := 1].
+		    ifFalse:[gridX := 1].
 self moveDo:[:aView|
-aligning ifTrue:[
+	aligning ifTrue:[
-n := ((aView computeCorner x) \\ gridX).
+	    n := ((aView computeCorner x) \\ gridX).
-n ~~ 0 ifTrue:[n := n negated]
+	    n ~~ 0 ifTrue:[n := n negated]
-ifFalse:[n := gridX]
+		  ifFalse:[n := gridX]
-] ifFalse:[
+	] ifFalse:[
-n := 1
+	    n := 1
-].
+	].
-self shiftLayout:aView left:n right:n
+	self shiftLayout:aView left:n right:n
 ]
 !
 moveSelectionUp
 "move selection up
 "
 |gridY n|
 gridAlign notNil ifTrue:[gridY := gridAlign y]
-ifFalse:[gridY := 1].
+		    ifFalse:[gridY := 1].
 self moveDo:[:aView|
-aligning ifTrue:[
+	aligning ifTrue:[
-n := ((aView computeOrigin x) \\ gridY).
+	    n := ((aView computeOrigin x) \\ gridY).
-n == 0 ifTrue:[n := gridY].
+	    n == 0 ifTrue:[n := gridY].
-n := n negated.
+	    n := n negated.
-] ifFalse:[
+	] ifFalse:[
-n := -1
+	    n := -1
-].
+	].
-self shiftLayout:aView top:n bottom:n
+	self shiftLayout:aView top:n bottom:n
 ]
 ! !
 !UIObjectView methodsFor:'user actions - position'!
 of one selection the object is aligned to the bottom of its superview
 "
 |bmost delta sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self numberOfSelections > 1 ifTrue:[
+	    self numberOfSelections > 1 ifTrue:[
-bmost := (sel first) computeCorner y.
+		bmost := (sel first) computeCorner y.
-self transaction:#alignBottom selectionDo:[:v|
+		self transaction:#alignBottom selectionDo:[:v|
-(delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
+		    (delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
-self shiftLayout:v top:delta bottom:delta.
+			self shiftLayout:v top:delta bottom:delta.
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-self extentToFrame:#Bottom do:[:aLayout|
+		self extentToFrame:#Bottom do:[:aLayout|
-aLayout bottomOffset:0.
+		    aLayout bottomOffset:0.
-aLayout bottomFraction:1.0
+		    aLayout bottomFraction:1.0
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 of one selection the object is aligned to the center/horizontal of its superview
 "
 |view center sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-view := self singleSelection.
+	    view := self singleSelection.
-view notNil ifTrue:[
+	    view notNil ifTrue:[
-view   := self findContainerOfView:view.
+		view   := self findContainerOfView:view.
-center := view computeExtent
+		center := view computeExtent
-] ifFalse:[
+	    ] ifFalse:[
-view   := sel first.
+		view   := sel first.
-center := view computeCorner + view computeOrigin.
+		center := view computeCorner + view computeOrigin.
-].
+	    ].
-center := center x // 2.
+	    center := center x // 2.
-self transaction:#alignCenterHorizontal selectionDo:[:v|
+	    self transaction:#alignCenterHorizontal selectionDo:[:v|
-|newX oldX delta|
+		|newX oldX delta|
-oldX  := v computeOrigin x.
+		oldX  := v computeOrigin x.
-newX  := center - ((v computeCorner x - oldX) // 2).
+		newX  := center - ((v computeCorner x - oldX) // 2).
-delta := newX - oldX.
+		delta := newX - oldX.
-self shiftLayout:v left:delta right:delta
+		self shiftLayout:v left:delta right:delta
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 of one selection the object is aligned to the center/vertical of its superview
 "
 |view center sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-view := self singleSelection.
+	    view := self singleSelection.
-view notNil ifTrue:[
+	    view notNil ifTrue:[
-view   := self findContainerOfView:view.
+		view   := self findContainerOfView:view.
-center := view computeExtent
+		center := view computeExtent
-] ifFalse:[
+	    ] ifFalse:[
-view   := sel first.
+		view   := sel first.
-center := view computeCorner + view computeOrigin.
+		center := view computeCorner + view computeOrigin.
-].
+	    ].
-center := center y // 2.
+	    center := center y // 2.
-self transaction:#alignCenterVertical selectionDo:[:v|
+	    self transaction:#alignCenterVertical selectionDo:[:v|
-|newY oldY delta|
+		|newY oldY delta|
-oldY  := v computeOrigin y.
+		oldY  := v computeOrigin y.
-newY  := center - ((v computeCorner y - oldY) // 2).
+		newY  := center - ((v computeCorner y - oldY) // 2).
-delta := newY - oldY.
+		delta := newY - oldY.
-self shiftLayout:v top:delta bottom:delta
+		self shiftLayout:v top:delta bottom:delta
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 alignSelectionLeft
 "align selection to the left of the first object in the selection; in case
 of one selection the object is aligned to the left of its superview
 "
 |lmost delta sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self numberOfSelections > 1 ifTrue:[
+	    self numberOfSelections > 1 ifTrue:[
-lmost := (sel first) computeOrigin x.
+		lmost := (sel first) computeOrigin x.
-self transaction:#alignLeft selectionDo:[:v|
+		self transaction:#alignLeft selectionDo:[:v|
-(delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
+		    (delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
-self shiftLayout:v left:delta right:delta
+			self shiftLayout:v left:delta right:delta
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-self extentToFrame:#Left do:[:aLayout|
+		self extentToFrame:#Left do:[:aLayout|
-aLayout leftOffset:0.
+		    aLayout leftOffset:0.
-aLayout leftFraction:0.0.
+		    aLayout leftFraction:0.0.
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 alignSelectionLeftAndRight
 "align selection to the left/right of the first object in the selection; in case
 of one selection the object is aligned to the left/right of its superview
 "
 |lmost rmost sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self numberOfSelections > 1 ifTrue:[
+	    self numberOfSelections > 1 ifTrue:[
-lmost := (sel first) computeOrigin x.
+		lmost := (sel first) computeOrigin x.
-rmost := (sel first) computeCorner x.
+		rmost := (sel first) computeCorner x.
-self transaction:#alignLeftRight selectionDo:[:aView|
+		self transaction:#alignLeftRight selectionDo:[:aView|
-|layout|
+		    |layout|
-layout := self class asLayoutFrameFromView:aView.
+		    layout := self class asLayoutFrameFromView:aView.
-layout notNil ifTrue:[
+		    layout notNil ifTrue:[
-self createUndoLayout:aView.
+			self createUndoLayout:aView.
-aView geometryLayout:layout.
+			aView geometryLayout:layout.
-undoHistory withoutTransactionDo:[
+			undoHistory withoutTransactionDo:[
-self shiftLayout:aView left:(lmost - (aView computeOrigin x))
+			    self shiftLayout:aView left:(lmost - (aView computeOrigin x))
-right:(rmost - (aView computeCorner x)).
+						  right:(rmost - (aView computeCorner x)).
-].
+			].
-self elementChangedSize:aView
+			self elementChangedSize:aView
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-self extentToFrame:#LeftRight do:[:aLayout|
+		self extentToFrame:#LeftRight do:[:aLayout|
-aLayout leftOffset:0.
+		    aLayout leftOffset:0.
-aLayout leftFraction:0.0.
+		    aLayout leftFraction:0.0.
-aLayout rightOffset:0.
+		    aLayout rightOffset:0.
-aLayout rightFraction:1.0.
+		    aLayout rightFraction:1.0.
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ].
 !
 alignSelectionRight
 of one selection the object is aligned to the right of its superview
 "
 |rmost delta sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self numberOfSelections > 1 ifTrue:[
+	    self numberOfSelections > 1 ifTrue:[
-rmost := (sel first) computeCorner x.
+		rmost := (sel first) computeCorner x.
-self transaction:#alignRight selectionDo:[:v|
+		self transaction:#alignRight selectionDo:[:v|
-(delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
+		    (delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
-self shiftLayout:v left:delta right:delta
+			self shiftLayout:v left:delta right:delta
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-self extentToFrame:#Right do:[:aLayout|
+		self extentToFrame:#Right do:[:aLayout|
-aLayout rightOffset:0.
+		    aLayout rightOffset:0.
-aLayout rightFraction:1.0.
+		    aLayout rightFraction:1.0.
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 alignSelectionTop
 "align selection to the top of the first object in the selection; in case
 of one selection the object is aligned to the top of its superview
 "
 |tmost delta sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self numberOfSelections > 1 ifTrue:[
+	    self numberOfSelections > 1 ifTrue:[
-tmost := (sel first) computeOrigin y.
+		tmost := (sel first) computeOrigin y.
-self transaction:#alignTop selectionDo:[:v|
+		self transaction:#alignTop selectionDo:[:v|
-(delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
+		    (delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
-self shiftLayout:v top:delta bottom:delta
+			self shiftLayout:v top:delta bottom:delta
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-self extentToFrame:#Top do:[:aLayout|
+		self extentToFrame:#Top do:[:aLayout|
-aLayout topOffset:0.
+		    aLayout topOffset:0.
-aLayout topFraction:0.0.
+		    aLayout topFraction:0.0.
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 alignSelectionTopAndBottom
 of one selection the object is aligned to the top/bottom of its superview
 "
 |tmost bmost sel|
 (sel := self moveableSelection) notNil ifTrue:[
-self withSelectionHiddenDo:[
+	self withSelectionHiddenDo:[
-self numberOfSelections > 1 ifTrue:[
+	    self numberOfSelections > 1 ifTrue:[
-tmost := (sel first) computeOrigin y.
+		tmost := (sel first) computeOrigin y.
-bmost := (sel first) computeCorner y.
+		bmost := (sel first) computeCorner y.
-self transaction:#alignTopBottom selectionDo:[:aView|
+		self transaction:#alignTopBottom selectionDo:[:aView|
-|layout|
+		    |layout|
-layout := self class asLayoutFrameFromView:aView.
+		    layout := self class asLayoutFrameFromView:aView.
-layout notNil ifTrue:[
+		    layout notNil ifTrue:[
-self createUndoLayout:aView.
+			self createUndoLayout:aView.
-aView geometryLayout:layout.
+			aView geometryLayout:layout.
-undoHistory withoutTransactionDo:[
+			undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:(tmost - (aView computeOrigin y))
+			    self shiftLayout:aView top:(tmost - (aView computeOrigin y))
-bottom:(bmost - (aView computeCorner y)).
+						bottom:(bmost - (aView computeCorner y)).
-].
+			].
-self elementChangedSize:aView
+			self elementChangedSize:aView
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-self extentToFrame:#TopBottom do:[:aLayout|
+		self extentToFrame:#TopBottom do:[:aLayout|
-aLayout topOffset:0.
+		    aLayout topOffset:0.
-aLayout topFraction:0.0.
+		    aLayout topFraction:0.0.
-aLayout bottomOffset:0.
+		    aLayout bottomOffset:0.
-aLayout bottomFraction:1.0.
+		    aLayout bottomFraction:1.0.
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 centerSelection:aOneArgBlockXorY orientation:orientation
 "center selection horizontal or vertical dependant on the block result( x or y).
 The argument to the block is the point.
 "
 |superview min max delta val|
 (self moveableSelection) isNil ifTrue:[
-^ self
+	^ self
 ].
 self withSelectionHiddenDo:[
-max := 0.
+	max := 0.
-self selectionDo:[:aView |
+	self selectionDo:[:aView |
-superview isNil ifTrue:[
+	    superview isNil ifTrue:[
-superview := self findContainerOfView:aView
+		superview := self findContainerOfView:aView
-] ifFalse:[
+	    ] ifFalse:[
-(self findContainerOfView:aView) == superview ifFalse:[
+		(self findContainerOfView:aView) == superview ifFalse:[
-^ self notify:'views must have same superview'.
+		    ^ self notify:'views must have same superview'.
-]
+		]
-].
+	    ].
-val := aOneArgBlockXorY value:(aView computeOrigin).
+	    val := aOneArgBlockXorY value:(aView computeOrigin).
-min isNil ifTrue:[min := val]
+	    min isNil ifTrue:[min := val]
-ifFalse:[min := min min:val].
+		     ifFalse:[min := min min:val].
-val := aOneArgBlockXorY value:(aView computeCorner).
+	    val := aOneArgBlockXorY value:(aView computeCorner).
-max := max max:val.
+	    max := max max:val.
-].
+	].
-val := aOneArgBlockXorY value:(superview computeExtent).
+	val := aOneArgBlockXorY value:(superview computeExtent).
-max := (min + val - max) // 2.
+	max := (min + val - max) // 2.
-max == min ifFalse:[
+	max == min ifFalse:[
-|type|
+	    |type|
-(orientation == #y) ifTrue:[type := #centerVertical]
+	    (orientation == #y) ifTrue:[type := #centerVertical]
-ifFalse:[type := #centerHorizontal].
+			       ifFalse:[type := #centerHorizontal].
-delta := max - min.
+	    delta := max - min.
-self transaction:type selectionDo:[:v|
+	    self transaction:type selectionDo:[:v|
-orientation == #y ifTrue:[
+		orientation == #y ifTrue:[
-self shiftLayout:v top:delta bottom:delta
+		    self shiftLayout:v top:delta bottom:delta
-] ifFalse:[
+		] ifFalse:[
-self shiftLayout:v left:delta right:delta
+		    self shiftLayout:v left:delta right:delta
-]
+		]
-]
+	    ]
-].
+	].
-self layoutChanged
+	self layoutChanged
 ]
 !
 |layout type|
 type := ('extent', toWhat asString) asSymbol.
 self transaction:type selectionDo:[:aView|
-layout := self class asLayoutFrameFromView:aView.
+	layout := self class asLayoutFrameFromView:aView.
-layout notNil ifTrue:[
+	layout notNil ifTrue:[
-self createUndoLayout:aView.
+	    self createUndoLayout:aView.
-aBlock value:layout.
+	    aBlock value:layout.
-aView geometryLayout:layout.
+	    aView geometryLayout:layout.
-self elementChangedSize:aView.
+	    self elementChangedSize:aView.
-]
+	]
 ]
 !
 spreadSelectionHor
 "spread multiple selection horizontal
 |sumWidths min max viewsInOrder topsInOrder count space sel|
 sel := self moveableSelection.
 (sel notNil and:[self numberOfSelections > 1]) ifFalse:[
-^ self
+	^ self
 ].
 self withSelectionHiddenDo:[
-count := 0.
+	count := 0.
-sumWidths := 0.
+	sumWidths := 0.
-max := 0.
+	max := 0.
-self selectionDo:[:aView |
+	self selectionDo:[:aView |
-sumWidths := sumWidths + aView width.
+	    sumWidths := sumWidths + aView width.
-min isNil ifTrue:[min := aView left]
+	    min isNil ifTrue:[min := aView left]
-ifFalse:[min := min min:(aView left)].
+		     ifFalse:[min := min min:(aView left)].
-max := max max:(aView right).
+	    max := max max:(aView right).
-count := count + 1
+	    count := count + 1
-].
+	].
-viewsInOrder := Array withAll:sel.
+	viewsInOrder := Array withAll:sel.
-topsInOrder  := viewsInOrder collect:[:aView | aView left].
+	topsInOrder  := viewsInOrder collect:[:aView | aView left].
-topsInOrder sortWith:viewsInOrder.
+	topsInOrder sortWith:viewsInOrder.
-space := (((max - min) - sumWidths) / (count - 1)) rounded asInteger.
+	space := (((max - min) - sumWidths) / (count - 1)) rounded asInteger.
-self transaction:#spreadHorizontal objects:viewsInOrder do:[:aView|
+	self transaction:#spreadHorizontal objects:viewsInOrder do:[:aView|
-|delta|
+	    |delta|
-delta := min - aView computeOrigin x.
+	    delta := min - aView computeOrigin x.
-self shiftLayout:aView left:delta right:delta.
+	    self shiftLayout:aView left:delta right:delta.
-min := min + aView computeExtent x + space
+	    min := min + aView computeExtent x + space
-]
+	]
 ].
 self layoutChanged
 !
 |sumHeights min max viewsInOrder topsInOrder count space sel|
 sel := self moveableSelection.
 (sel notNil and:[self numberOfSelections > 1]) ifFalse:[
-^ self
+	^ self
 ].
 self withSelectionHiddenDo:[
-count := 0.
+	count := 0.
-sumHeights := 0.
+	sumHeights := 0.
-max := 0.
+	max := 0.
-self selectionDo:[:aView |
+	self selectionDo:[:aView |
-sumHeights := sumHeights + aView height.
+	    sumHeights := sumHeights + aView height.
-min isNil ifTrue:[min := aView top]
+	    min isNil ifTrue:[min := aView top]
-ifFalse:[min := min min:(aView top)].
+		     ifFalse:[min := min min:(aView top)].
-max   := max max:(aView bottom).
+	    max   := max max:(aView bottom).
-count := count + 1
+	    count := count + 1
-].
+	].
-viewsInOrder := Array withAll:sel.
+	viewsInOrder := Array withAll:sel.
-topsInOrder  := viewsInOrder collect:[:aView|aView top].
+	topsInOrder  := viewsInOrder collect:[:aView|aView top].
-topsInOrder sortWith:viewsInOrder.
+	topsInOrder sortWith:viewsInOrder.
-space := (((max - min) - sumHeights) / (count - 1)) rounded asInteger.
+	space := (((max - min) - sumHeights) / (count - 1)) rounded asInteger.
-self transaction:#spreadVertical objects:viewsInOrder do:[:aView|
+	self transaction:#spreadVertical objects:viewsInOrder do:[:aView|
-|delta|
+	    |delta|
-delta := min - aView computeOrigin y.
+	    delta := min - aView computeOrigin y.
-self shiftLayout:aView top:delta bottom:delta.
+	    self shiftLayout:aView top:delta bottom:delta.
-min := min + aView height + space
+	    min := min + aView height + space
-]
+	]
 ].
 self layoutChanged
 ! !
 !UIObjectView methodsFor:'user actions - undo history'!
 "undo last action
 "
 |newSel oldSel|
 undoHistory isEmpty ifFalse:[
-self hasSelection ifTrue:[
+	self hasSelection ifTrue:[
-oldSel := OrderedCollection new.
+	    oldSel := OrderedCollection new.
-newSel := OrderedCollection new.
+	    newSel := OrderedCollection new.
-self selectionDo:[:aView||p|
+	    self selectionDo:[:aView||p|
-(p := self propertyOfView:aView) notNil ifTrue:[
+		(p := self propertyOfView:aView) notNil ifTrue:[
-oldSel add:(p identifier)
+		    oldSel add:(p identifier)
-]
+		]
-].
+	    ].
-self setSelection:nil withRedraw:true.
+	    self setSelection:nil withRedraw:true.
-].
+	].
-self withSelectionHiddenDo:[undoHistory undoLast:1].
+	self withSelectionHiddenDo:[undoHistory undoLast:1].
-oldSel notNil ifTrue:[
+	oldSel notNil ifTrue:[
-oldSel do:[:id||v|
+	    oldSel do:[:id||v|
-(v := self findViewWithId:id) notNil ifTrue:[newSel add:v]
+		(v := self findViewWithId:id) notNil ifTrue:[newSel add:v]
-].
+	    ].
-self select:newSel.
+	    self select:newSel.
-]
+	]
 ].
 ! !
 !UIObjectView::ResizeData methodsFor:'accessing'!
 undo history used by the UIPainter-Tool; to each operation, an undo block
 and some text is stored. In case of a required undo, the corresponding
 undo block will be performed.
 [see also:]
-UIObjectView
+	UIObjectView
-UIPainterView
+	UIPainterView
 [author:]
-Claus Atzkern
+	Claus Atzkern
 "
 ! !
 addUndoSelector:aSelector withArgs:anArray
 "add a selector with arguments to the current opened transaction; in case that no
 transaction is opened or disabled the block will not be kept in the history.
 "
 self isTransactionOpen ifTrue:[
-transaction add:(Association key:aSelector value:anArray)
+	transaction add:(Association key:aSelector value:anArray)
 ]
 ! !
 withinTransaction:aType text:aTextOrNil do:aBlock
 "open a transaction; perform the block; at least close the transaction
 "
 (enabled and:[transaction isNil]) ifTrue:[
-transaction := Transaction type:aType text:aTextOrNil.
+	transaction := Transaction type:aType text:aTextOrNil.
-aBlock value.
+	aBlock value.
-transaction isEmpty ifFalse:[
+	transaction isEmpty ifFalse:[
-identifier := identifier + 1.
+	    identifier := identifier + 1.
-transaction identifier:identifier.
+	    transaction identifier:identifier.
-history addLast:transaction.
+	    history addLast:transaction.
-history size > (self class maxHistorySize) ifTrue:[history removeFirst]
+	    history size > (self class maxHistorySize) ifTrue:[history removeFirst]
-].
+	].
-transaction := nil
+	transaction := nil
 ] ifFalse:[
-aBlock value
+	aBlock value
 ]
 !
 withoutTransactionDo:aNoneArgBlock
 "evaluate the block without opening a transaction or keeping changes
 openUndoMenu
 |list tabs top slv hzp inset selection okButton|
 history isEmpty ifTrue:[
-^ self
+	^ self
 ].
 top  := StandardSystemView new label:'undo history'; extent:250@350.
 slv  := ScrollableView for:SelectionInListView origin:0.0@0.0 corner:1.0@1.0 in:top.
 hzp  := HorizontalPanelView origin:0.0@1.0 corner:1.0@1.0 in:top.
 tabs unit:#cm.
 tabs positions:#(0 5).
 tabs align:#(#left #left).
 list := history collect:[:aTrans||e|
-e := MultiColListEntry new.
+	e := MultiColListEntry new.
-e colAt:1 put:(aTrans typeAsString).
+	e colAt:1 put:(aTrans typeAsString).
-e colAt:2 put:(aTrans text ? '').
+	e colAt:2 put:(aTrans text ? '').
-e tabulatorSpecification:tabs.
+	e tabulatorSpecification:tabs.
-e
+	e
 ].
 slv list:list.
 slv action:[:index | selection := index ].
 top openModal.
 selection notNil ifTrue:[
-self undoLast:(history size - selection + 1).
+	self undoLast:(history size - selection + 1).
 ]
 ! !
 !UIObjectView::UndoHistory methodsFor:'testing'!
 isModified
 "returns true if history is modified
 "
 self isEmpty ifTrue:[
-^ false
+	^ false
 ].
 ^ history last identifier ~~ startIdentifier
 !
 isTransactionOpen
 transaction := nil.
 enabled     := false.
 repeatTimes := nTransactions min:(history size).
 repeatTimes timesRepeat:[
-transaction := history removeLast.
+	transaction := history removeLast.
-actions     := transaction actions.
+	actions     := transaction actions.
-actions isCollection ifTrue:[
+	actions isCollection ifTrue:[
-actions reverseDo:[:aBlock|
+	    actions reverseDo:[:aBlock|
-painter perform:(aBlock key) with:(aBlock value)
+		painter perform:(aBlock key) with:(aBlock value)
-]
+	    ]
-] ifFalse:[
+	] ifFalse:[
-painter perform:(actions key) with:(actions value)
+	    painter perform:(actions key) with:(actions value)
-]
+	]
 ].
 enabled := true.
 ! !
 !UIObjectView::UndoHistory::Transaction class methodsFor:'documentation'!
 "
 represents one undo record, keeping the associated type and printable text
 and the undo action performed on an undo request
 [see also:]
-UndoHistory
+	UndoHistory
 [author:]
-Claus Atzkern
+	Claus Atzkern
 "
 ! !
 !UIObjectView::UndoHistory::Transaction class methodsFor:'instance creation'!
 name := String new:(line size + size).
 size := 1.
 sep  := Character space.
 line do:[:c|
-(c isUppercase) ifFalse:[
+	(c isUppercase) ifFalse:[
-name at:size put:c
+	    name at:size put:c
-] ifTrue:[
+	] ifTrue:[
-name at:size put:sep.
+	    name at:size put:sep.
-sep  := $&.
+	    sep  := $&.
-size := size + 1.
+	    size := size + 1.
-name at:size put:(c asLowercase)
+	    name at:size put:(c asLowercase)
-].
+	].
-size := size + 1
+	size := size + 1
 ].
 ^ name
 ! !
 !UIObjectView::UndoHistory::Transaction methodsFor:'adding'!
 add:anUndoBlock
 "add an undo action to the current transaction
 "
 actions isNil ifTrue:[
-actions := anUndoBlock
+	actions := anUndoBlock
 ] ifFalse:[
-actions isCollection ifFalse:[
+	actions isCollection ifFalse:[
-actions := OrderedCollection with:actions
+	    actions := OrderedCollection with:actions
-].
+	].
-actions add:anUndoBlock.
+	actions add:anUndoBlock.
 ]
 ! !
 !UIObjectView::UndoHistory::Transaction methodsFor:'initialization'!

changeset 1120	230fe13c4e51
parent 1112	761e38b891e6
child 1222	bcb8b0ec295c