hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:5af567f52811
+:668eb9eae2ac
 ! !
 !UIObjectView methodsFor:'event handling'!
-doKeyInput:key
-^ self
-!
 elementChanged:aView
 "some element has been changed - kludge to force a resizing
 operation (for child layout recomputation) in its superView"
 aView superView sizeChanged:nil.
 exposeX:x y:y width:w height:h
 "handle an expose event from device; redraw selection
 "
 super exposeX:x y:y width:w height:h.
+self selectionDo:[:v | self showSelected:v]
-selection notNil ifTrue:[
-self selectionDo:[:v | self showSelected:v]
-]
 !
 keyPress:key x:x y:y
+<resource: #keyboard ( #InspectIt #Delete #BackSpace #Cut) >
 key == #InspectIt ifTrue:[
 ^ self inspectSelection
 ].
-(key == #Delete or:[key == #BackSpace]) ifTrue: [
+(key == #Cut or:[key == #Delete or:[key == #BackSpace]]) ifTrue: [
-selection notNil ifTrue:[
+^ self deleteSelection
-self deleteSelection
+].
-]
-] ifFalse:[
+super keyPress:key x:x y:y
-keyPressAction notNil ifTrue:[
-keyPressAction value:key
-]
-]
 !
 processEvent:anEvent
 pressAction      := [:pressPoint | self startSelectOrMove:pressPoint].
 shiftPressAction := [:pressPoint | self startSelectMoreOrMove:pressPoint].
 motionAction     := [:movePoint  | nil].
 releaseAction    := [nil].
-keyPressAction   := [:key | self doKeyInput:key].
+keyPressAction   := nil.
 self cursor:Cursor normal.
 !
 startCreate:aPoint
 "start a widget create
 "
 |widget object start frame delta|
-createClass isNil ifTrue:[
+(createClass isNil or:[self numberOfSelections > 1]) ifTrue:[
-^ self setDefaultActions
-].
-(selection isKindOf:Collection) ifTrue:[
 self unselect.
 ^ self setDefaultActions.
 ].
 motionAction  := [:movePoint| self doDragCreate:movePoint].
 releaseAction := [ self endCreate].
-selection notNil ifTrue:[
+widget := self singleSelection.
-(    (self isPoint:aPoint containedIn:selection)
-and:[self supportsSubComponents:selection]
+(     widget notNil
-) ifFalse:[
+and:[(self isPoint:aPoint containedIn:widget)
-self unselect
+and:[self supportsSubComponents:widget]]
-]
+) ifFalse:[
-].
+self unselect.
+widget := self.
-widget := selection ? self.
+].
 object := createClass new.
 widget addSubView:object.
 start := self alignToGrid:aPoint.
 delta := widget originRelativeTo:self.
 delta := (self alignToGrid:aPoint) - org.
 dX := delta x.
 dY := delta y.
 undoHistory disabledTransitionDo:[
-self shifLayout:anObject top:dY bottom:dY left:dX right:dX
+self shiftLayout:anObject top:dY bottom:dY left:dX right:dX
 ]
 ]
 !
 startObjectMoveAt:aPoint
 self startObjectMove:selection at:aPoint.
-selection size == 0 ifTrue:[
+selection isCollection ifTrue:[
+movedObject := selection
+] ifFalse:[
 movedObject := Array with:selection
-] ifFalse:[
-movedObject := selection
 ].
 super unselect.
 moveDelta := movedObject collect:[:aView|
 aPoint - aView computeOrigin
 ].
-selection := movedObject.
+self transaction:#move objects:movedObject do:[:aView|
-self transaction:#move selectionDo:[:aView|
 self invertOutlineOf:aView.
 self undoBlockPositionChanged:aView
 ].
-selection := nil
 !
 startSelectMoreOrMove:aPoint
 "add/remove to/from selection"
 "
 |anObject b|
 testMode ifTrue:[^ self].
-"if there is one selection and point hits handle, start a resize
+"if there is one object selected and point hits a handle, start a resize
 "
-self singleSelection notNil ifTrue:[
+anObject := self singleSelection.
-b := self whichHandleOf:selection isHitBy:aPoint.
+anObject notNil ifTrue:[
+b := self whichHandleOf:anObject isHitBy:aPoint.
 (b notNil and:[b ~~ #view]) ifTrue:[
-^ self startResizeBorder:b of:selection.
+^ self startResizeBorder:b of:anObject.
 ]
 ].
 anObject := self findObjectAt:aPoint.
 (self isSelected:anObject) ifFalse:[
 super unselect.
 self select:anObject.
 ].
-selection isCollection ifTrue:[
+(self numberOfSelections ~~ 1) ifTrue:[
 releaseAction := [
 self setDefaultActions.
 self select:anObject
 ]
 ] ifFalse:[
 "resize selected view
 "
 |object|
 object := self singleSelection.
+(object geometryLayout) isNil ifTrue:[
+^ self setDefaultActions.
+].
 self actionResize:object selector:b.
 self transaction:#extent selectionDo:[:aView|
 self undoBlockDimensionChanged:aView
 ].
 !UIObjectView methodsFor:'private resizing-subviews'!
 resize:aView bottom:aPoint
 undoHistory disabledTransitionDo:[
-self shifLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
+self shiftLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
 ]
 !
 resize:aView bottomLeft:aPoint
 undoHistory disabledTransitionDo:[
-self shifLayout:aView top:0
+self shiftLayout:aView top:0
 bottom:((aPoint y) - (aView computeCorner y))
 left:((aPoint x) - (aView computeOrigin x))
 right:0
 ]
 !
 |delta|
 delta := aPoint - aView computeCorner.
 undoHistory disabledTransitionDo:[
-self shifLayout: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
 undoHistory disabledTransitionDo:[
-self shifLayout: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 disabledTransitionDo:[
-self shifLayout: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
 undoHistory disabledTransitionDo:[
-self shifLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
+self shiftLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
 ]
 !
 resize:aView top:aPoint
 undoHistory disabledTransitionDo:[
-self shifLayout:aView top:((aPoint y) - (aView computeOrigin y)) bottom:0
+self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y)) bottom:0
 ]
 !
 resize:aView topRight:aPoint
 undoHistory disabledTransitionDo:[
-self shifLayout:aView top:((aPoint y) - (aView computeOrigin y))
+self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y))
 bottom:0
 left:0
 right:((aPoint x) - (aView computeCorner x))
 ]
 ! !
 !UIObjectView methodsFor:'private shift-layout'!
-shifLayout:aView left:l right:r
+shiftLayout:aView left:l right:r
 "shift layout for a view; in case of an open transaction, the undo
 action is registered
 "
-self shifLayout:aView top:0 bottom:0 left:l right:r
+self shiftLayout:aView top:0 bottom:0 left:l right:r
 !
-shifLayout:aView top:t bottom:b
+shiftLayout:aView top:t bottom:b
 "shift layout for a view; in case of an open transaction, the undo
 action is registered
 "
-self shifLayout:aView top:t bottom:b left:0 right:0
+self shiftLayout:aView top:t bottom:b left:0 right:0
 !
-shifLayout:aView top:t bottom:b left:l right:r
+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
 "
 |layout|
-self undoBlockPositionChanged:aView.
 layout := aView geometryLayout.
-layout leftOffset:(layout leftOffset + l)
+layout isLayout ifTrue:[
-topOffset:(layout topOffset  + t).
+self undoBlockPositionChanged:aView.
-layout isLayoutFrame ifTrue:[
+layout leftOffset:(layout leftOffset + l)
-layout bottomOffset:(layout bottomOffset + b).
+topOffset:(layout topOffset  + t).
-layout  rightOffset:(layout rightOffset  + r).
-].
+layout isLayoutFrame ifTrue:[
+layout bottomOffset:(layout bottomOffset + b).
-aView geometryLayout:layout.
+layout  rightOffset:(layout rightOffset  + r).
+].
+aView geometryLayout:layout.
+] ifFalse:[
+|pixelOrigin|
+self undoBlockPositionChanged:aView.
+pixelOrigin := aView pixelOrigin.
+pixelOrigin := pixelOrigin + (l@t).
+aView pixelOrigin:pixelOrigin
+]
 ! !
 !UIObjectView methodsFor:'searching'!
 !
 isPoint:aPoint containedIn:aView
 "checks whether a point is covered by a view.
 "
-|org ext|
+|p|
-org := aView computeOrigin.
+p := device translatePoint:aPoint from:inputView id to:aView id.
-ext := aView computeExtent.
+(p x >= 0 and:[p y >= 0]) ifTrue:[
-^ ((org extent:ext) containsPoint:aPoint)
+p := aView extent - p.
+(p x >= 0 and:[p y >= 0]) ifTrue:[
+^ true
+]
+].
+^ false
 !
 whichBorderOf:aView isHitBy:aPoint
 |p r bw org|
 ! !
 !UIObjectView methodsFor:'selections'!
 addToSelection:something
-(testMode or:[something == selection]) ifFalse:[
+(self canSelect:something) ifTrue:[
 super addToSelection:something.
 self changed:#selection.
 ]
 !
 self singleSelectionDo:[:aView |
 aView inspect
 ]
 !
+numberOfSelections
+"return the number of selected entries"
+|sz|
+selection isNil ifTrue:[^ 0].
+selection isCollection ifTrue:[^ selection size]
+ifFalse:[^ 1 ]
+!
 removeFromSelection:something
 super removeFromSelection:something.
 self changed:#selection
 !
 select:something
-(testMode or:[something == selection]) ifFalse:[
+(self canSelect:something) ifTrue:[
 super select:something.
 self changed:#selection
 ]
 !
 selection
 ^ selection
-!
-selectionFindMinimum:aOneArgBlock
-"returns the minimum value from the block evaluated on each view
-in the selection
-"
-|min val|
-self selectionDo:[:aView|
-val := aOneArgBlock value:aView.
-min isNil ifTrue:[min := val]
-ifFalse:[min := min min:val]
-].
-^ min
 !
 selectionHiddenDo:aBlock
 "apply block to every object in selection"
 !
 singleSelection
 "returns single selection or nil
 "
-(selection isKindOf:SimpleView) ifTrue:[^ selection]
+selection isCollection ifFalse:[
-ifFalse:[^ nil]
+^ selection
+].
+selection size == 1 ifTrue:[ ^ selection at:1]
+ifFalse:[ ^ nil].
 !
 singleSelectionDo:aBlock
+|view|
-self singleSelection notNil ifTrue:[
-aBlock value:selection
+(view := self singleSelection) notNil ifTrue:[
+aBlock value:view
 ]
 !
 unselect
 selection notNil ifTrue:[
 ^ true
 !
+canPaste:something
+"returns true if something could be paste
+"
+something notNil ifTrue:[
+something isCollection ifTrue:[
+something notEmpty ifTrue:[
+^ (something at:1) isKindOf:UISpecification
+]
+] ifFalse:[
+^ something isKindOf:UISpecification
+]
+].
+^ false
+!
+canSelect:something
+^ (testMode not and:[something ~~ selection])
+!
+hasUndos
+"returns true if undoHistory not empty
+"
+^ undoHistory notEmpty
+!
 isHorizontalResizable:aComponent
 ^ self subclassResponsibility
 !
 undoHistory isTransactionOpen ifTrue:[
 |layout|
 layout := aView geometryLayout copy.
-undoHistory addUndoBlock:[aView geometryLayout:layout]
+layout isNil ifFalse:[
-]
+undoHistory addUndoBlock:[aView geometryLayout:layout]
+] ifTrue:[
+layout := aView pixelOrigin.
+undoHistory addUndoBlock:[aView pixelOrigin:layout]
+]
+]
+!
+undoDeleteAll
+"delete total undo history
+"
+undoHistory reinitialize
 !
 undoLast
 self undoLast:1
 !
 ! !
 !UIObjectView methodsFor:'user actions - dimension'!
 copyExtent
-(selection isNil or:[selection isKindOf:Collection]) ifTrue:[
+|object|
-^ self warn:'exactly one element must be selected'.
-].
+object := self singleSelection.
-copiedExtent := selection computeExtent
+object notNil ifTrue:[
+copiedExtent := object computeExtent
+] ifFalse:[
+self warn:'exactly one element must be selected'.
+]
 !
 ]
 ! !
 !UIObjectView methodsFor:'user actions - move'!
-basicMoveSelectionHorizontal:n
+moveSelectionDown:aNumber
-"move left:  n < 0
+|gridY|
-move right: n > 0
-"
+gridAlign notNil ifTrue:[
+gridY := gridAlign y.
+].
 self selectionHiddenDo:[
-self transaction:#move selectionDo:[:v| self shifLayout:v left:n right:n].
+self transaction:#move selectionDo:[:aView|
+|n d|
+n := aNumber.
+aligning ifTrue:[
+d := ((aView computeCorner y) \\ gridY).
+n := n * gridY.
+d ~~ 0 ifTrue:[
+n := n - d + 1.
+]
+].
+self shiftLayout:aView top:n bottom:n
+].
 self changed:#layout
 ]
 !
-basicMoveSelectionVertical:n
+moveSelectionLeft:aNumber
-"move up:   n < 0
+"move selection left
-move down: n > 0
+"
-"
+|gridX|
+gridAlign notNil ifTrue:[
+gridX := gridAlign x.
+].
 self selectionHiddenDo:[
-self transaction:#move selectionDo:[:v| self shifLayout:v top:n bottom:n ].
+self transaction:#move selectionDo:[:aView|
+|n d|
+n := aNumber.
+aligning ifTrue:[
+d := ((aView computeOrigin x) \\ gridX).
+d ~~ 0 ifTrue:[
+n := n-1.
+].
+n := (n * gridX) + d.
+].
+n := n negated.
+self shiftLayout:aView left:n right:n
+].
 self changed:#layout
 ]
+!
+moveSelectionRight:aNumber
-!
+"move selection right
+"
-moveSelectionDown:n
+|gridX|
-self basicMoveSelectionVertical:n
+gridAlign notNil ifTrue:[
+gridX := gridAlign x.
-!
+].
-moveSelectionLeft:n
+self selectionHiddenDo:[
-self basicMoveSelectionHorizontal:(n negated)
+self transaction:#move selectionDo:[:aView|
+|n d|
-!
+n := aNumber.
-moveSelectionRight:n
+aligning ifTrue:[
-self basicMoveSelectionHorizontal:n
+d := ((aView computeCorner x) \\ gridX).
+n := n * gridX.
-!
+d ~~ 0 ifTrue:[
+n := n - d + 1.
-moveSelectionUp:n
+]
-self basicMoveSelectionVertical:(n negated)
+].
+self shiftLayout:aView left:n right:n
+].
+self changed:#layout
+]
+!
+moveSelectionUp:aNumber
+"move selection up
+"
+|gridY|
+gridAlign notNil ifTrue:[
+gridY := gridAlign y.
+].
+self selectionHiddenDo:[
+self transaction:#move selectionDo:[:aView|
+|n d|
+n := aNumber.
+aligning ifTrue:[
+d := ((aView computeOrigin x) \\ gridY).
+d ~~ 0 ifTrue:[
+n := n-1.
+].
+n := (n * gridY) + d.
+].
+n := n negated.
+self shiftLayout:aView top:n bottom:n
+].
+self changed:#layout
+]
 ! !
 !UIObjectView methodsFor:'user actions - position'!
 alignSelectionBottom
-|bmost delta|
+|bmost delta layout|
-self selectionHiddenDo:[
+selection notNil ifTrue:[
-bmost := 0.
+self selectionHiddenDo:[
-self selectionDo:[:v| bmost := bmost max:(v computeCorner y)].
+self numberOfSelections > 1 ifTrue:[
+bmost := (selection at:1) computeCorner y.
-self transaction:#align selectionDo:[:v|
-(delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
+self transaction:#align selectionDo:[:v|
-self shifLayout:v top:delta bottom:delta.
+(delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
+self shiftLayout:v top:delta bottom:delta.
+]
+]
+] ifFalse:[
+layout := selection geometryLayout.
+(layout isLayout and:[layout isLayoutFrame]) ifFalse:[
+^ self
+].
+self transaction:#layout selectionDo:[:aView|
+self undoBlockDimensionChanged:aView.
+layout := aView geometryLayout.
+layout bottomOffset:0.
+layout bottomFraction:1.0.
+aView geometryLayout:layout.
+]
 ]
 ].
 self changed:#layout
 ]
 !
 alignSelectionCenterHor
-|counter centerX|
+|view center|
-self selectionHiddenDo:[
+selection notNil ifTrue:[
-counter := 0.
+self selectionHiddenDo:[
-centerX := 0.
+view := self singleSelection.
-self selectionDo:[:v |
+view notNil ifTrue:[
-centerX := centerX + (v computeCorner x + v computeOrigin x).
+view   := view superView.
-counter := counter + 1.
+center := view computeExtent
-].
+] ifFalse:[
-centerX := centerX // (counter * 2).
+view   := selection at:1.
+center := view computeCorner + view computeOrigin.
-self transaction:#align selectionDo:[:v|
+].
-|newX oldX delta|
+center := center x // 2.
-oldX  := v computeOrigin x.
+self transaction:#align selectionDo:[:v|
-newX  := centerX - ((v computeCorner x - oldX) // 2).
+|newX oldX delta|
-delta := newX - oldX.
+oldX  := v computeOrigin x.
-self shifLayout:v left:delta right:delta
+newX  := center - ((v computeCorner x - oldX) // 2).
+delta := newX - oldX.
+self shiftLayout:v left:delta right:delta
+].
+self changed:#layout
+]
+]
+!
+alignSelectionCenterVer
+|view center|
+selection notNil ifTrue:[
+self selectionHiddenDo:[
+view := self singleSelection.
+view notNil ifTrue:[
+view   := view superView.
+center := view computeExtent
+] ifFalse:[
+view   := selection at:1.
+center := view computeCorner + view computeOrigin.
+].
+center := center y // 2.
+self transaction:#align selectionDo:[:v|
+|newY oldY delta|
+oldY  := v computeOrigin y.
+newY  := center - ((v computeCorner y - oldY) // 2).
+delta := newY - oldY.
+self shiftLayout:v top:delta bottom:delta
+].
+self changed:#layout
+]
+]
+!
+alignSelectionLeft
+|lmost delta layout|
+selection notNil ifTrue:[
+self selectionHiddenDo:[
+self numberOfSelections > 1 ifTrue:[
+lmost := (selection at:1) computeOrigin x.
+self transaction:#align selectionDo:[:v|
+(delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
+self shiftLayout:v left:delta right:delta
+]
+]
+] ifFalse:[
+self transaction:#layout selectionDo:[:aView|
+layout := aView geometryLayout.
+layout isLayout ifTrue:[
+self undoBlockDimensionChanged:aView.
+layout leftOffset:0.
+layout leftFraction:0.0.
+aView geometryLayout:layout.
+]
+]
+]
 ].
 self changed:#layout
 ]
+!
+alignSelectionLeftAndRight
-!
+|lmost rmost layout|
-alignSelectionCenterVer
+selection notNil ifTrue:[
-|counter centerY|
+self selectionHiddenDo:[
+self numberOfSelections > 1 ifTrue:[
-self selectionHiddenDo:[
+lmost := (selection at:1) computeOrigin x.
-counter := 0.
+rmost := (selection at:1) computeCorner x.
-centerY := 0.
+self transaction:#align selectionDo:[:v|
-self selectionDo:[:v |
+self shiftLayout:v left:(lmost - (v computeOrigin x))
-centerY := centerY + (v computeCorner y + v computeOrigin y).
+right:(rmost - (v computeCorner x))
-counter := counter + 1.
+]
-].
+] ifFalse:[
-centerY := centerY // (counter * 2).
+self transaction:#layout selectionDo:[:aView|
+layout := aView geometryLayout.
-self transaction:#align selectionDo:[:v|
-|newY oldY delta|
+layout isLayout ifTrue:[
+self undoBlockDimensionChanged:aView.
-oldY  := v computeOrigin y.
+layout leftOffset:0.
-newY  := centerY - ((v computeCorner y - oldY) // 2).
+layout leftFraction:0.0.
-delta := newY - oldY.
+(layout isLayout and:[layout isLayoutFrame]) ifTrue:[
-self shifLayout:v top:delta bottom:delta
+layout rightOffset:0.
+layout rightFraction:1.0.
+].
+aView geometryLayout:layout.
+]
+]
+]
 ].
 self changed:#layout
 ]
 !
-alignSelectionLeft
+alignSelectionRight
-|lmost delta|
+|rmost delta layout|
-self selectionHiddenDo:[
+selection notNil ifTrue:[
-lmost := self selectionFindMinimum:[:v| v computeOrigin x].
+self selectionHiddenDo:[
+self numberOfSelections > 1 ifTrue:[
-self transaction:#align selectionDo:[:v|
+rmost := (selection at:1) computeCorner x.
-(delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
-self shifLayout:v left:delta right:delta
+self transaction:#align selectionDo:[:v|
+(delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
+self shiftLayout:v left:delta right:delta
+]
+]
+] ifFalse:[
+layout := selection geometryLayout.
+(layout isLayout and:[layout isLayoutFrame]) ifFalse:[
+^ self
+].
+self transaction:#layout selectionDo:[:aView|
+self undoBlockDimensionChanged:aView.
+layout := aView geometryLayout.
+layout rightOffset:0.
+layout rightFraction:1.0.
+aView geometryLayout:layout.
+]
 ]
 ].
 self changed:#layout
 ]
+!
-!
+alignSelectionTop
-alignSelectionLeftAndRight
+|tmost delta layout|
-|lmost rmost|
+selection notNil ifTrue:[
 self selectionHiddenDo:[
-lmost := self selectionFindMinimum:[:v| v computeOrigin x].
+self numberOfSelections > 1 ifTrue:[
-rmost := 0.
+tmost := (selection at:1) computeOrigin y.
-self selectionDo:[:v | rmost := rmost max:(v computeCorner x)].
+self transaction:#align selectionDo:[:v|
-self transaction:#align selectionDo:[:v|
+(delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
-self shifLayout:v left:(lmost - (v computeOrigin x))
+self shiftLayout:v top:delta bottom:delta
-right:(rmost - (v computeCorner x))
+]
+]
+] ifFalse:[
+self transaction:#layout selectionDo:[:aView|
+layout := aView geometryLayout.
+layout isLayout ifTrue:[
+self undoBlockDimensionChanged:aView.
+layout topOffset:0.
+layout topFraction:0.0.
+aView geometryLayout:layout.
+]
+]
+]
 ].
 self changed:#layout
 ]
-!
+!
-alignSelectionRight
-|rmost delta|
+alignSelectionTopAndBottom
+|tmost bmost layout|
-self selectionHiddenDo:[
-rmost := 0.
+selection notNil ifTrue:[
-self selectionDo:[:v| rmost := rmost max:(v computeCorner x)].
+self selectionHiddenDo:[
+self numberOfSelections > 1 ifTrue:[
-self transaction:#align selectionDo:[:v|
+tmost := (selection at:1) computeOrigin y.
-(delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
+bmost := (selection at:1) computeCorner y.
-self shifLayout:v left:delta right:delta
+self transaction:#align selectionDo:[:v|
+self shiftLayout:v top:(tmost - (v computeOrigin y))
+bottom:(bmost - (v computeCorner y))
+]
+] ifFalse:[
+self transaction:#layout selectionDo:[:aView|
+layout := aView geometryLayout.
+layout isLayout ifTrue:[
+self undoBlockDimensionChanged:aView.
+layout topOffset:0.
+layout topFraction:0.0.
+(layout isLayout and:[layout isLayoutFrame]) ifTrue:[
+layout bottomOffset:0.
+layout bottomFraction:1.0.
+].
+aView geometryLayout:layout.
+]
+]
 ]
-].
-self changed:#layout
-]
-!
-alignSelectionTop
-|tmost delta|
-self selectionHiddenDo:[
-tmost := self selectionFindMinimum:[:v| v computeOrigin y].
-self transaction:#align selectionDo:[:v|
-(delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
-self shifLayout:v top:delta bottom:delta
-]
-].
-self changed:#layout
-]
-!
-alignSelectionTopAndBottom
-|tmost bmost|
-self selectionHiddenDo:[
-tmost := self selectionFindMinimum:[:v| v computeOrigin y].
-bmost := 0.
-self selectionDo:[:v| bmost := bmost max:(v computeCorner y)].
-self transaction:#align selectionDo:[:v|
-self shifLayout:v top:(tmost - (v computeOrigin y))
-bottom:(bmost - (v computeCorner y))
 ].
 self changed:#layout
 ]
 !
 max == min ifFalse:[
 delta := max - min.
 self transaction:#center selectionDo:[:v|
 orientation == #y ifTrue:[
-self shifLayout:v top:delta bottom:delta
+self shiftLayout:v top:delta bottom:delta
 ] ifFalse:[
-self shifLayout:v left:delta right:delta
+self shiftLayout:v left:delta right:delta
 ]
 ].
 self changed:#layout
 ]
 ]
 !
 spreadSelectionHor
 |sumWidths min max viewsInOrder topsInOrder count space|
-(selection isKindOf:Collection) ifFalse:[^ self].
+(self numberOfSelections > 1) ifFalse:[
+^ self
+].
 self selectionHiddenDo:[
 count := 0.
 sumWidths := 0.
 max := 0.
 self transaction:#spread objects:viewsInOrder do:[:aView|
 |delta|
 delta := min - aView computeOrigin x.
-self shifLayout:aView left:delta right:delta.
+self shiftLayout:aView left:delta right:delta.
 min := min + aView computeExtent x + space
 ].
 self changed:#layout
 ]
 !
 spreadSelectionVer
 |sumHeights min max viewsInOrder topsInOrder count space|
-(selection isKindOf:Collection) ifFalse:[^ self].
+(self numberOfSelections > 1) ifFalse:[
+^ self
+].
 self selectionHiddenDo:[
 count := 0.
 sumHeights := 0.
 max := 0.
 self transaction:#spread objects:viewsInOrder do:[:aView|
 |delta|
 delta := min - aView computeOrigin y.
-self shifLayout:aView top:delta bottom:delta.
+self shiftLayout:aView top:delta bottom:delta.
 min := min + aView height + space
 ].
 self changed:#layout
 ]
 ! !

changeset 58	668eb9eae2ac
parent 55	19e021c8f1ef
child 59	0a2b2ff030a0