hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:7542ab7fbbfe
+:85ef247db6b1
-'From Smalltalk/X, Version:3.1.4 on 25-feb-1997 at 2:17:24 pm'                  !
 ObjectView subclass:#UIObjectView
 	instanceVariableNames:'inputView testMode undoHistory copiedExtent actionData
-		createClass clipChildren'
+		createClass clipChildren selectionHiddenLevel
+		setOfSuperViewsSizeChanged'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 hitDelta
 ^ 4
 ! !
+!UIObjectView class methodsFor:'queries'!
+layoutType:aView
+"returns layout type of aView or nil
+"
+|layout spec|
+layout := aView geometryLayout.
+layout notNil ifTrue:[
+layout isLayout ifTrue:[
+layout isLayoutFrame        ifTrue:[ ^ #LayoutFrame ].
+layout isLayoutOrigin       ifTrue:[ ^ #LayoutOrigin ].
+layout isAlignmentOrigin    ifTrue:[ ^ #AlignmentOrigin ].
+] ifFalse:[
+layout isRectangle          ifTrue:[ ^ #Rectangle ].
+layout isPoint              ifTrue:[ ^ #Point ].
+]
+] ifFalse:[
+spec := aView superView specClass.
+spec canResizeSubComponents     ifTrue:[ ^ #Extent ].
+].
+^ nil
+! !
 !UIObjectView methodsFor:'accessing'!
 gridAlign
+"returns state of aligning to grid
+"
 ^ aligning
 !
 gridAlign:aBool
+"change state of aligning to grid
+"
 aBool ifTrue:[self alignOn]
 ifFalse:[self alignOff]
 !
 !
 gridShown:aBool
+"change visibility of grid
+"
 aBool ifTrue:[self showGrid]
 ifFalse:[self hideGrid]
 !
 hideGrid
+"hide grid
+"
 gridShown ifTrue:[
-self withSelectionHiddenDo:[
+self withSelectionHiddenDo:[super hideGrid]
-super hideGrid
-]
 ]
 !
 showGrid
-self withSelectionHiddenDo:[
+"show grid
-super showGrid
+"
-]
+self withSelectionHiddenDo:[super showGrid]
-"Modified: 5.9.1995 / 12:47:46 / claus"
 !
 testMode
-"returns testMode
+"returns true if running test
 "
 ^ testMode
 !
 testMode:aBoolean
-"change testMode
+"change test mode
 "
 (aBoolean == testMode) ifFalse:[
 testMode := aBoolean.
 testMode ifTrue:[
 ! !
 !UIObjectView methodsFor:'blocked'!
 addObject:anObject
-"add the argument, anObject to the contents - with redraw"
+"add the argument, anObject to the contents - with redraw
+"
 self halt
 !
 addObjectWithoutRedraw:anObject
-"add the argument, anObject to the contents - with redraw"
+"add the argument, anObject to the contents - with redraw
+"
 self halt
 ! !
 !UIObjectView methodsFor:'event handling'!
-elementChanged:aView
+elementChangedSize:aView
-"some element has been changed - kludge to force a resizing
+"some element has changed its size; collect them during selectionHiddenLevel
-operation (for child layout recomputation) in its superView"
+is on
+"
-aView superView sizeChanged:nil.
+selectionHiddenLevel ~~ 0 ifTrue:[
-self changed:#any.
+setOfSuperViewsSizeChanged add:aView superView
+] ifFalse:[
+aView superView sizeChanged:nil
-!
+]
-elementChangedLayout:aView
-"some element has been changed - kludge to force a resizing
-operation (for child layout recomputation) in its superView"
-aView superView sizeChanged:nil.
-self changed:#layout.
 !
 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]
+"/    selectionHiddenLevel == 0 ifTrue:[
+self selectionDo:[:v | self showSelected:v]
+"/    ]
 !
 keyPress:key x:x y:y
+"any key pressed
+"
 <resource: #keyboard ( #InspectIt #Delete #BackSpace #Cut) >
 key == #InspectIt ifTrue:[
 ^ self inspectSelection
 ].
 !
 sizeChanged:how
+"size of a view(s) changed
+"
 self withSelectionHiddenDo:[
 super sizeChanged:how
 ]
 ! !
 !UIObjectView methodsFor:'initialization'!
 initialize
+"setup attributes
+"
 super initialize.
 "funny: since I do not want the created widgets to get pointer
 events, I put an InputView on top of them, which catches those events
 and passes them back to me - have to take care, that this inputView
 is always on top
 "
 inputView := InputView origin:0.0@0.0 extent:1.0@1.0 in:self.
+setOfSuperViewsSizeChanged := IdentitySet new.
 inputView eventReceiver:self.
 inputView enableButtonEvents.
 inputView enableButtonMotionEvents.
 self setDefaultActions.
 undoHistory  := UndoHistory new.
 testMode     := false.
 clipChildren := true.
+selectionHiddenLevel := 0.
 (self class gridShown) ifTrue:[
 super showGrid
 ].
 ! !
 !UIObjectView methodsFor:'misc'!
 cursor:aCursor
+"set cursor
+"
 inputView realized ifTrue:[
 inputView cursor:aCursor
 ].
 super cursor:aCursor
 !
 invertOutlineOf:anObject
+"invert outline of an object
+"
 |wasClipped delta|
 (wasClipped := clipChildren) ifTrue:[
 self clippedByChildren:(clipChildren := false).
 ].
 !
 setDefaultActions
+"set default actions
+"
 pressAction      := [:pressPoint | self startSelectOrMove:pressPoint].
 shiftPressAction := [:pressPoint | self startSelectMoreOrMove:pressPoint].
 motionAction     := [:movePoint  | nil].
 releaseAction    := [nil].
 keyPressAction   := nil.
 self cursor:Cursor normal.
-!
-showDragging:something offset:anOffset
-"drag around a View"
-|top|
-self forEach:something do:[:anObject |
-self drawRectangle:((anObject origin + anOffset) extent:(anObject extent))
-]
 ! !
 !UIObjectView methodsFor:'object creation'!
-XXstartCreate:aPoint
-"start a widget create
-"
-|widget object start frame delta|
-(createClass isNil or:[self numberOfSelections > 1]) ifTrue:[
-self unselect.
-^ self setDefaultActions.
-].
-motionAction  := [:movePoint| self doDragCreate:movePoint].
-releaseAction := [ self endCreate].
-widget := self singleSelection.
-(     widget notNil
-and:[(self isPoint:aPoint containedIn:widget)
-and:[self supportsSubComponents:widget]]
-) ifFalse:[
-self unselect.
-widget := self.
-].
-object := createClass new.
-widget addSubView:object.
-start := self alignToGrid:aPoint.
-delta := widget originRelativeTo:self.
-frame := Rectangle origin:(start - delta) corner:start.
-object origin:(frame origin).
-self setupCreatedObject:object.
-object realize.
-self actionCreate:object frame:frame delta:delta.
-self invertOutlineOf:object.
-!
 actionCreate:anObject frame:aFrame delta:aDelta
 "create and initialize action data
 "
 |extent x y selectors values|
 self unselect.
 (self isPoint:aPoint containedIn:widget) ifFalse:[
 widget := self
 ] ifTrue:[
-(self supportsSubComponents:widget) ifFalse:[
+widget specClass supportsSubComponents ifFalse:[
 ^ self setDefaultActions.
 ]
 ]
 ] ifFalse:[
 widget := self
 ]
 !
 endObjectMove
-"cleanup after object move"
+"cleanup after object(s) move
+"
 movedObject notNil ifTrue:[
 movedObject do:[:aView|
 self invertOutlineOf:aView
 ].
 ]
 !
 startObjectMoveAt:aPoint
+"start object(s) move at a point
+"
 self startObjectMove:selection at:aPoint.
 selection isCollection ifTrue:[
 movedObject := selection
 ] ifFalse:[
 ]
 ]
 !
 startSelectOrMove:aPoint
-"a button is pressed at a point
+"a button is pressed at a point; start moving or selection
 "
-|anObject b|
+|aView b|
 testMode ifTrue:[^ self].
-"if there is one object selected and point hits a handle, start a resize
+aView := self singleSelection.
-"
-anObject := self singleSelection.
+aView notNil ifTrue:[
+(aView superView specClass canResizeSubComponents) ifTrue:[
-anObject notNil ifTrue:[
+b := self whichHandleOf:aView isHitBy:aPoint.
-b := self whichHandleOf:anObject isHitBy:aPoint.
+(b notNil and:[b ~~ #view]) ifTrue:[
-(b notNil and:[b ~~ #view]) ifTrue:[
+^ self startResizeBorder:b of:aView.
-^ self startResizeBorder:b of:anObject.
+]
 ]
 ].
-anObject := self findObjectAt:aPoint.
+(aView := self findObjectAt:aPoint) isNil ifTrue:[
-"nothing is selected
-"
-anObject isNil ifTrue:[
 ^ self unselect
 ].
-(self isSelected:anObject) ifFalse:[
+(self canMove:aView) ifFalse:[
 super unselect.
-self select:anObject.
+^ self select:aView
+].
+(self isSelected:aView) ifFalse:[
+super unselect.
+self select:aView.
 ].
 (self numberOfSelections ~~ 1) ifTrue:[
 releaseAction := [
 self setDefaultActions.
-self select:anObject
+self select:aView
 ]
 ] ifFalse:[
 releaseAction := [self setDefaultActions]
 ].
 "prepare move operation for an object
 "
 motionAction := [:movePoint|
 (aPoint dist:movePoint) > 4.0 ifTrue:[
 self startObjectMoveAt:aPoint
 ]
 ].
 !
 doDragResize:aPoint
-"do a widget resize drag"
+"do a widget resize drag
+"
 |p object|
 object := actionData object.
 self invertOutlineOf:object.
 self invertOutlineOf:object
 !
 endResize
-"cleanup after object resize"
+"cleanup after object resize
+"
-self invertOutlineOf:(actionData object).
+|object|
+object := actionData object.
+actionData := nil.
+self invertOutlineOf:object.
 self setDefaultActions.
-super select:(actionData object).
+self elementChangedSize:object.
+super select:object.
 self changed:#layout.
-actionData := nil
 !
 startResizeBorder:b of:selection
 "resize selected view
 "
 |object|
 object := self singleSelection.
-(object geometryLayout) isNil ifTrue:[
-^ self setDefaultActions.
-].
 self actionResize:object selector:b.
 self transaction:#extent selectionDo:[:aView|
 self undoLayoutView:aView
 ].
 self invertOutlineOf:object
 ! !
 !UIObjectView methodsFor:'private handles'!
-handlesOf:aComponent do:aBlock
+handlesOf:aView do:aBlock
-|delta layout vertical horizontal|
+|dlta type v h|
-layout := aComponent geometryLayout.
+dlta := (aView originRelativeTo:self) - aView origin.
-delta  := (aComponent originRelativeTo:self) - aComponent origin.
+type := self class layoutType:aView.
-(layout isLayout not or:[layout isLayoutFrame]) ifTrue:[
+(type == #LayoutFrame or:[type == #Rectangle]) ifTrue:[
-vertical   := self isVerticalResizable:aComponent.
+v := self isVerticalResizable:aView.
-horizontal := self isHorizontalResizable:aComponent.
+h := self isHorizontalResizable:aView.
-] ifFalse:[
-vertical   := false.
+h ifTrue:[  aBlock value:(aView leftCenter   + dlta) value:#left.
-horizontal := false.
+aBlock value:(aView rightCenter  + dlta) value:#right.
 ].
+v ifTrue:[  aBlock value:(aView topCenter    + dlta) value:#top.
-horizontal ifTrue:[
+aBlock value:(aView bottomCenter + dlta) value:#bottom.
-aBlock value:(aComponent leftCenter   + delta) value:#left.
+].
-aBlock value:(aComponent rightCenter  + delta) value:#right.
-].
+(h and:[v]) ifTrue:[
+aBlock value:(aView origin     + dlta) value:#origin.
-vertical ifTrue:[
+aBlock value:(aView topRight   + dlta) value:#topRight.
-aBlock value:(aComponent topCenter    + delta) value:#top.
+aBlock value:(aView bottomLeft + dlta) value:#bottomLeft.
-aBlock value:(aComponent bottomCenter + delta) value:#bottom.
+aBlock value:(aView corner     + dlta) value:#corner.
-].
+^ self
+]
-(horizontal and:[vertical]) ifTrue:[
+].
-aBlock value:(aComponent origin     + delta) value:#origin.
-aBlock value:(aComponent corner     + delta) value:#corner.
+aBlock value:(aView origin     + dlta) value:#view.
-aBlock value:(aComponent topRight   + delta) value:#topRight.
+aBlock value:(aView topRight   + dlta) value:#view.
-aBlock value:(aComponent bottomLeft + delta) value:#bottomLeft.
+aBlock value:(aView bottomLeft + dlta) value:#view.
-] ifFalse:[
-aBlock value:(aComponent origin     + delta) value:#view.
+type == #Extent ifTrue:[
-aBlock value:(aComponent corner     + delta) value:#view.
+v := self isVerticalResizable:aView.
-aBlock value:(aComponent topRight   + delta) value:#view.
+h := self isHorizontalResizable:aView.
-aBlock value:(aComponent bottomLeft + delta) value:#view.
-].
+v ifTrue:[aBlock value:(aView bottomCenter + dlta) value:#bottom].
+h ifTrue:[aBlock value:(aView rightCenter  + dlta) value:#right ].
+(h and:[v]) ifTrue:[
+aBlock value:(aView corner + dlta) value:#corner.
+^ self
+]
+].
+aBlock value:(aView corner + dlta) value:#view.
 !
 showSelected:aComponent
+"show object selected
+"
 |wasClipped delta oldPaint|
 self paint:Color black.
 (wasClipped := clipChildren) ifTrue:[
 ].
 self paint:oldPaint.
 !
 showUnselected:aComponent
+"show object unselected
+"
 |wasClipped delta r oldPaint|
 r := aComponent origin extent:8@8.
 (wasClipped := clipChildren) ifTrue:[
 ]
 !
 whichHandleOf:aView isHitBy:aPoint
+"returns kind of handle or nil
+"
 |bounds|
 self handlesOf:aView do:[:pnt :what |
 ((pnt - (4@4) extent:7@7) containsPoint:aPoint) ifTrue:[
 ^ what
 ! !
 !UIObjectView methodsFor:'private resizing-subviews'!
 resize:aView bottom:aPoint
+"resize a views bottom
+"
 undoHistory disabledTransitionDo:[
 self shiftLayout:aView top:0 bottom:((aPoint y) - (aView computeCorner y))
 ]
 !
 resize:aView bottomLeft:aPoint
+"resize a views bottom and left
+"
 undoHistory disabledTransitionDo:[
 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 disabledTransitionDo:[
 self shiftLayout:aView top:0 bottom:(delta y) left:0 right:(delta x)
 ]
 !
 resize:aView left:aPoint
+"resize a views left
+"
 undoHistory disabledTransitionDo:[
 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 disabledTransitionDo:[
 ]
 !
 resize:aView right:aPoint
+"resize a views right
+"
 undoHistory disabledTransitionDo:[
 self shiftLayout:aView left:0 right:((aPoint x) - (aView computeCorner x))
 ]
 !
 resize:aView top:aPoint
+"resize a views top
+"
 undoHistory disabledTransitionDo:[
 self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y)) bottom:0
 ]
 !
 resize:aView topRight:aPoint
+"resize a views top and right
+"
 undoHistory disabledTransitionDo:[
 self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y))
 bottom:0
 left:0
 right:((aPoint x) - (aView computeCorner x))
 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|
+|type layout|
-layout := aView geometryLayout.
+type := self class layoutType:aView.
-self undoLayoutView:aView.
+type notNil ifTrue:[
+self undoLayoutView:aView.
-layout isLayout ifTrue:[
-layout leftOffset:(layout leftOffset + l)
+type == #Extent ifTrue:[
-topOffset:(layout topOffset  + t).
+^ aView geometryLayout:layout
+].
-layout isLayoutFrame ifTrue:[
-layout bottomOffset:(layout bottomOffset + b).
+layout := aView geometryLayout.
-layout  rightOffset:(layout rightOffset  + r).
-].
+layout isLayout ifTrue:[
-aView geometryLayout:layout.
+layout leftOffset:(layout leftOffset + l)
-] ifFalse:[
+topOffset:(layout topOffset  + t).
-|pixelOrigin|
+type == #LayoutFrame ifTrue:[
-pixelOrigin := aView pixelOrigin.
+layout bottomOffset:(layout bottomOffset + b).
-pixelOrigin := pixelOrigin + (l@t).
+layout  rightOffset:(layout rightOffset  + r).
-aView pixelOrigin:pixelOrigin
+]
-]
+] ifFalse:[
+type == #Rectangle ifTrue:[
+layout left:(layout left   + l)
+right:(layout right  + r)
+top:(layout top    + t)
+bottom:(layout bottom + b).
+] ifFalse:[     "POINT"
+layout x:(layout x + l) y:(layout y + t).
+]
+].
+aView geometryLayout:layout
+]
 ! !
 !UIObjectView methodsFor:'searching'!
 findObjectAt:aPoint
 ! !
 !UIObjectView methodsFor:'selections'!
 addToSelection:something
+"add something to selection
+"
 (self canSelect:something) ifTrue:[
 super addToSelection:something.
 self changed:#selection.
 ]
 !
 inspectSelection
+"inspect selection
+"
 self singleSelectionDo:[:aView |
 aView inspect
 ]
 !
 numberOfSelections
-"return the number of selected entries"
+"return the number of selected entries
+"
 |sz|
 selection isNil ifTrue:[^ 0].
 selection isCollection ifTrue:[^ selection size]
 ifFalse:[^ 1 ]
 !
 removeFromSelection:something
+"remove something from selection
+"
 super removeFromSelection:something.
 self changed:#selection
 !
 select:something
+"change selection to something
+"
 (self canSelect:something) ifTrue:[
 super select:something.
 self changed:#selection
 ]
 !
 selection
+"returns selection
+"
 ^ selection
 !
-selectionHiddenDo:aBlock
+showSelection
-"apply block to every object in selection"
+selectionHiddenLevel == 0 ifTrue:[
+super showSelection.
-self selectionDo:[:aView |
+].
-self showUnselected:aView.
-].
-device flush.
-aBlock value.
-self selectionDo:[:aView |
-self showSelected:aView
-]
 !
 singleSelection
 "returns single selection or nil
 "
 selection size == 1 ifTrue:[ ^ selection at:1]
 ifFalse:[ ^ nil].
 !
 singleSelectionDo:aBlock
+"perform block with argument a view in case of one selection
+"
 |view|
 (view := self singleSelection) notNil ifTrue:[
 aBlock value:view
 ]
 !
 unselect
+"clear selection
+"
 selection notNil ifTrue:[
 super unselect.
 self changed:#selection
 ]
 !
 withSelectionHiddenDo:aBlock
-"evaluate aBlock while selection is hidden"
+"apply block with selection hidden (no handles)
+"
+selectionHiddenLevel := selectionHiddenLevel + 1.
+selectionHiddenLevel == 1 ifTrue:[
+self selectionDo:[:aView| self showUnselected:aView].
+device flush.
+].
+aBlock valueNowOrOnUnwindDo:[
+selectionHiddenLevel == 1 ifTrue:[
+setOfSuperViewsSizeChanged notEmpty ifTrue:[
+setOfSuperViewsSizeChanged do:[:aSuperView|
+aSuperView sizeChanged:nil
+].
+setOfSuperViewsSizeChanged := IdentitySet new
+].
+self selectionDo:[:aView| self showSelected:aView].
+].
+selectionHiddenLevel := selectionHiddenLevel - 1.
+]
+!
+withoutSelectionDo:aBlock
+"evaluate aBlock while selection is nilled
+"
 |sel|
 selection isNil ifTrue:[
 aBlock value
 ] ifFalse:[
 super unselect.
 aBlock value.
 super select:sel
 ]
-"Modified: 6.9.1995 / 01:46:16 / claus"
 ! !
 !UIObjectView methodsFor:'testing'!
 canMove:something
-^ true
+"returns always true; all contained views can be moved
+"
+|sv|
+something notNil ifTrue:[
+self forEach:something do:[:v|
+sv ~~ v superView ifTrue:[
+(sv notNil or:[v superView specClass isLayoutContainer]) ifTrue:[
+^ false
+].
+sv := v superView
+]
+].
+^ true
+].
+^ false
 !
 canPaste:something
 "returns true if something could be paste
 ].
 ^ false
 !
+canPasteInto:something
+"can paste into something ?
+"
+something notNil ifTrue:[
+something isCollection ifFalse:[
+^ something specClass supportsSubComponents
+].
+something size == 1 ifTrue:[
+^ (something at:1) specClass supportsSubComponents
+]
+].
+^ false
+!
 canSelect:something
+"returns true if something can be selected and testMode is disabled
+"
 ^ (testMode not and:[something ~~ selection])
 !
 hasUndos
 "
 ^ undoHistory notEmpty
 !
 isHorizontalResizable:aComponent
+"returns true if instance is horizontal resizeable
+"
 ^ self subclassResponsibility
 !
 isVerticalResizable:aComponent
+"returns true if instance is vertical resizeable
+"
 ^ self subclassResponsibility
-!
-supportsSubComponents:something
-"returns true if somrthing supports subcomponents
-"
-|specClass|
-something notNil ifTrue:[
-something isCollection ifFalse:[
-specClass := something specClass
-] ifTrue:[
-something size == 1 ifTrue:[
-specClass := (something at:1) specClass
-]
-].
-specClass notNil ifTrue:[
-^ specClass basicNew supportsSubComponents
-]
-].
-^ false
 ! !
 !UIObjectView methodsFor:'transaction'!
 transaction:aType objects:something do:aOneArgBlock
 ! !
 !UIObjectView methodsFor:'user actions - arrange'!
 lowerSelection
+"lower all objects in the selection
+"
 self selectionDo:[:aView| aView lower ].
 !
 raiseSelection
+"raise all objects in the selection
+"
 self selectionDo:[:aView| aView raise ].
 inputView raise.
 ! !
 !UIObjectView methodsFor:'user actions - dimension'!
 copyExtent
+"copy the extent from the selected object
+"
 |object|
 object := self singleSelection.
 object notNil ifTrue:[
 !
 pasteExtent
+"paste the copied extent to all objects in the selection
+"
 copiedExtent notNil ifTrue:[
 self transition:#extent dimensionDo:[:v|
 self resize:v corner:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 pasteHeight
+"paste the copied extent height to all objects in the selection
+"
 copiedExtent notNil ifTrue:[
 self transition:'paste height' dimensionDo:[:v|
 self resize:v bottom:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 pasteWidth
+"paste the copied extent width to all objects in the selection
+"
 copiedExtent notNil ifTrue:[
 self transition:'paste width' dimensionDo:[:v|
 self resize:v right:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 setDimension:aLayout
-|type|
+"change layout for all selected objects
+"
-aLayout isLayout ifTrue:[
+self transition:#layout dimensionDo:[:v|
-aLayout isLayoutFrame ifTrue:[
+v geometryLayout:(aLayout copy)
-type := #layoutFrame
+].
-] ifFalse:[
-aLayout isAlignmentOrigin ifTrue:[
+!
-type := #layoutAlignOrigin.
-] ifFalse:[
+setExtent:anExtent
-type := #layoutOrigin
+"change extent for all selected objects
-]
+"
-]
+self transition:#layout dimensionDo:[:v|
-] ifFalse:[
+v extent:anExtent.
-type := #layout
+].
-].
-self transition:type dimensionDo:[:v| v geometryLayout:(aLayout copy)]
 !
 setToDefaultExtent
+"change extent of all selected views to their default extent
+"
 self transition:#extent dimensionDo:[:v|
 self resize:v corner:(v computeOrigin + (v preferredExtent))
 ]
 !
 setToDefaultHeight
+"change height of all selected views to their default height
+"
 self transition:'default height' dimensionDo:[:v|
 self resize:v bottom:(v computeOrigin + (v preferredExtent))
 ]
 !
 setToDefaultWidth
+"change width of all selected views to their default width
+"
 self transition:'default width' dimensionDo:[:v|
 self resize:v right:(v computeOrigin + (v preferredExtent))
 ]
 !
 transition:aType dimensionDo:aOneArgBlock
 "change dimension within a transaction for the selected elements by evaluating
 the block with the argument a view.
 "
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self transaction:aType selectionDo:[:aView|
-self undoLayoutView:aView.
+(self class layoutType:aView) notNil ifTrue:[
-aOneArgBlock value:aView.
+self undoLayoutView:aView.
+aOneArgBlock value:aView.
+self elementChangedSize:aView.
+]
+]
+].
+self changed:#layout
+! !
+!UIObjectView methodsFor:'user actions - move'!
+moveSelectionDown:aNumber
+"move selection down
+"
+|gridY|
+(self canMove:selection) ifTrue:[
+gridAlign notNil ifTrue:[gridY := gridAlign y].
+self withSelectionHiddenDo:[
+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
 ]
-! !
-!UIObjectView methodsFor:'user actions - move'!
-moveSelectionDown:aNumber
-|gridY|
-gridAlign notNil ifTrue:[
-gridY := gridAlign y.
-].
-self selectionHiddenDo:[
-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
-]
 !
 moveSelectionLeft:aNumber
 "move selection left
 "
 |gridX|
-gridAlign notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-gridX := gridAlign x.
+gridAlign notNil ifTrue:[gridX := gridAlign x].
-].
+self withSelectionHiddenDo:[
-self selectionHiddenDo:[
+self transaction:#move selectionDo:[:aView|
-self transaction:#move selectionDo:[:aView|
+|n d|
-|n d|
+n := aNumber.
-n := aNumber.
+aligning ifTrue:[
-aligning ifTrue:[
+d := ((aView computeOrigin x) \\ gridX).
-d := ((aView computeOrigin x) \\ gridX).
+d ~~ 0 ifTrue:[
-d ~~ 0 ifTrue:[
+n := n-1.
-n := n-1.
+].
+n := (n * gridX) + d.
 ].
-n := (n * gridX) + d.
+n := n negated.
-].
+self shiftLayout:aView left:n right:n
-n := n negated.
+]
-self shiftLayout:aView left:n right:n
 ].
 self changed:#layout
 ]
 !
 moveSelectionRight:aNumber
 "move selection right
 "
 |gridX|
-gridAlign notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-gridX := gridAlign x.
+gridAlign notNil ifTrue:[gridX := gridAlign x].
-].
+self withSelectionHiddenDo:[
-self selectionHiddenDo:[
+self transaction:#move selectionDo:[:aView|
-self transaction:#move selectionDo:[:aView|
+|n d|
-|n d|
+n := aNumber.
-n := aNumber.
+aligning ifTrue:[
-aligning ifTrue:[
+d := ((aView computeCorner x) \\ gridX).
-d := ((aView computeCorner x) \\ gridX).
+n := n * gridX.
-n := n * gridX.
+d ~~ 0 ifTrue:[
-d ~~ 0 ifTrue:[
+n := n - d + 1.
-n := n - d + 1.
+]
-]
+].
-].
+self shiftLayout:aView left:n right:n
-self shiftLayout:aView left:n right:n
+]
 ].
 self changed:#layout
 ]
 !
 moveSelectionUp:aNumber
 "move selection up
 "
 |gridY|
-gridAlign notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-gridY := gridAlign y.
+gridAlign notNil ifTrue:[gridY := gridAlign y].
-].
+self withSelectionHiddenDo:[
-self selectionHiddenDo:[
+self transaction:#move selectionDo:[:aView|
-self transaction:#move selectionDo:[:aView|
+|n d|
-|n d|
+n := aNumber.
-n := aNumber.
+aligning ifTrue:[
-aligning ifTrue:[
+d := ((aView computeOrigin x) \\ gridY).
-d := ((aView computeOrigin x) \\ gridY).
+d ~~ 0 ifTrue:[
-d ~~ 0 ifTrue:[
+n := n-1.
-n := n-1.
+].
+n := (n * gridY) + d.
 ].
-n := (n * gridY) + d.
+n := n negated.
-].
+self shiftLayout:aView top:n bottom:n
-n := n negated.
+]
-self shiftLayout:aView top:n bottom:n
 ].
 self changed:#layout
 ]
 ! !
 !UIObjectView methodsFor:'user actions - position'!
 alignSelectionBottom
+"align selection to the bottom of the first object in the selection; in case
+of one selection the object is aligned to the bottom of its superview
+"
 |bmost delta layout|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 bmost := (selection at:1) computeCorner y.
 self transaction:#align selectionDo:[:v|
 (delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
 ]
 ]
 ] ifFalse:[
 layout := selection geometryLayout.
-(layout isLayout and:[layout isLayoutFrame]) ifFalse:[
+(layout isLayout and:[layout isLayoutFrame]) ifTrue:[
-^ self
+self transaction:#layout selectionDo:[:aView|
-].
+self undoLayoutView:aView.
+layout := aView geometryLayout.
-self transaction:#layout selectionDo:[:aView|
+layout bottomOffset:0.
-self undoLayoutView:aView.
+layout bottomFraction:1.0.
-layout := aView geometryLayout.
+aView geometryLayout:layout.
-layout bottomOffset:0.
+]
-layout bottomFraction:1.0.
-aView geometryLayout:layout.
 ]
 ]
 ].
 self changed:#layout
 ]
 !
 alignSelectionCenterHor
+"align selection to the center/horizontal of the first object in the selection; in case
+of one selection the object is aligned to the center/horizontal of its superview
+"
 |view center|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 view := self singleSelection.
 view notNil ifTrue:[
 view   := view superView.
 center := view computeExtent
 oldX  := v computeOrigin x.
 newX  := center - ((v computeCorner x - oldX) // 2).
 delta := newX - oldX.
 self shiftLayout:v left:delta right:delta
-].
+]
-self changed:#layout
+].
-]
+self changed:#layout
 ]
 !
 alignSelectionCenterVer
+"align selection to the center/vertical of the first object in the selection; in case
+of one selection the object is aligned to the center/vertical of its superview
+"
 |view center|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 view := self singleSelection.
 view notNil ifTrue:[
 view   := view superView.
 center := view computeExtent
 oldY  := v computeOrigin y.
 newY  := center - ((v computeCorner y - oldY) // 2).
 delta := newY - oldY.
 self shiftLayout:v top:delta bottom:delta
-].
+]
-self changed:#layout
+].
-]
+self changed:#layout
 ]
 !
 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 layout|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 lmost := (selection at:1) computeOrigin x.
 self transaction:#align selectionDo:[:v|
 (delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
 self changed:#layout
 ]
 !
 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 layout|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 lmost := (selection at:1) computeOrigin x.
 rmost := (selection at:1) computeCorner x.
 self transaction:#align selectionDo:[:v|
 self shiftLayout:v left:(lmost - (v computeOrigin x))
-right:(rmost - (v computeCorner x))
+right:(rmost - (v computeCorner x)).
+self elementChangedSize:v.
 ]
 ] ifFalse:[
 self transaction:#layout selectionDo:[:aView|
 layout := aView geometryLayout.
 (layout isLayout and:[layout isLayoutFrame]) ifTrue:[
 layout rightOffset:0.
 layout rightFraction:1.0.
 ].
 aView geometryLayout:layout.
+self elementChangedSize:aView.
 ]
 ]
 ]
 ].
 self changed:#layout
-]
+].
 !
 alignSelectionRight
+"align selection to the right of the first object in the selection; in case
+of one selection the object is aligned to the right of its superview
+"
 |rmost delta layout|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 rmost := (selection at:1) computeCorner x.
 self transaction:#align selectionDo:[:v|
 (delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
 ]
 ]
 ] ifFalse:[
 layout := selection geometryLayout.
-(layout isLayout and:[layout isLayoutFrame]) ifFalse:[
+(layout isLayout and:[layout isLayoutFrame]) ifTrue:[
-^ self
+self transaction:#layout selectionDo:[:aView|
-].
+self undoLayoutView:aView.
+layout := aView geometryLayout.
-self transaction:#layout selectionDo:[:aView|
+layout rightOffset:0.
-self undoLayoutView:aView.
+layout rightFraction:1.0.
-layout := aView geometryLayout.
+aView geometryLayout:layout.
-layout rightOffset:0.
+]
-layout rightFraction:1.0.
-aView geometryLayout:layout.
 ]
 ]
 ].
 self changed:#layout
 ]
 !
 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 layout|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 tmost := (selection at:1) computeOrigin y.
 self transaction:#align selectionDo:[:v|
 (delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
 ]
 !
 alignSelectionTopAndBottom
+"align selection to the top/bottom of the first object in the selection; in case
+of one selection the object is aligned to the top/bottom of its superview
+"
 |tmost bmost layout|
-selection notNil ifTrue:[
+(self canMove:selection) ifTrue:[
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 tmost := (selection at:1) computeOrigin y.
 bmost := (selection at:1) computeCorner y.
 self transaction:#align selectionDo:[:v|
 self shiftLayout:v top:(tmost - (v computeOrigin y))
-bottom:(bmost - (v computeCorner y))
+bottom:(bmost - (v computeCorner y)).
+self elementChangedSize:v.
 ]
 ] ifFalse:[
-self transaction:#layout selectionDo:[:aView|
+self transaction:#align selectionDo:[:aView|
 layout := aView geometryLayout.
 layout isLayout ifTrue:[
 self undoLayoutView:aView.
 layout topOffset:0.
 (layout isLayout and:[layout isLayoutFrame]) ifTrue:[
 layout bottomOffset:0.
 layout bottomFraction:1.0.
 ].
 aView geometryLayout:layout.
-]
+] ifFalse:[
+|y x|
+self undoLayoutView:aView.
+x := aView extent x.
+y := aView superView extent y.
+aView extent:(x @ y)
+].
+self elementChangedSize:aView.
 ]
 ]
 ].
 self changed:#layout
 ]
+!
+alignSingleSelection:aBlock
+|type layout|
+self withSelectionHiddenDo:[
+self transaction:#align selectionDo:[:aView|
+type := self class layoutType:aView.
+type notNil ifTrue:[
+self undoLayoutView:aView.
+layout := aView layout.
+type == #LayoutFrame ifFalse:[
+layout := aView bounds asLayout
+].
+aBlock value:layout.
+aView geometryLayout:layout.
+]
+]
+].
+self changed:#layout
 !
 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 selectionHiddenDo:[
+(self canMove:selection) ifFalse:[
+^ self
+].
+self withSelectionHiddenDo:[
 max := 0.
 self selectionDo:[:aView |
 superview isNil ifTrue:[
 superview := aView superView
 orientation == #y ifTrue:[
 self shiftLayout:v top:delta bottom:delta
 ] ifFalse:[
 self shiftLayout:v left:delta right:delta
 ]
-].
+]
-self changed:#layout
+].
-]
+self changed:#layout
 ]
 !
 "
 self centerSelection:[:aPoint| aPoint y] orientation:#y
 !
 spreadSelectionHor
+"spread multiple selection horizontal
+"
 |sumWidths min max viewsInOrder topsInOrder count space|
-(self numberOfSelections > 1) ifFalse:[
+(self numberOfSelections > 1 and:[self canMove:selection]) ifFalse:[
 ^ self
 ].
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 count := 0.
 sumWidths := 0.
 max := 0.
 self selectionDo:[:aView |
 |delta|
 delta := min - aView computeOrigin x.
 self shiftLayout:aView left:delta right:delta.
 min := min + aView computeExtent x + space
-].
+]
-self changed:#layout
+].
-]
+self changed:#layout
 !
 spreadSelectionVer
+"spread multiple selection vertical
+"
 |sumHeights min max viewsInOrder topsInOrder count space|
-(self numberOfSelections > 1) ifFalse:[
+(self numberOfSelections > 1 and:[self canMove:selection]) ifFalse:[
 ^ self
 ].
-self selectionHiddenDo:[
+self withSelectionHiddenDo:[
 count := 0.
 sumHeights := 0.
 max := 0.
 self selectionDo:[:aView |
 |delta|
 delta := min - aView computeOrigin y.
 self shiftLayout:aView top:delta bottom:delta.
 min := min + aView height + space
-].
+]
-self changed:#layout
+].
-]
+self changed:#layout
 ! !
 !UIObjectView methodsFor:'user actions - undo history'!
 openUndoMenu
+"open undo menu
+"
 self unselect.
-undoHistory openUndoMenu.
+self withSelectionHiddenDo:[
+undoHistory openUndoMenu
+].
 self changed:#tree
 !
 removeUndoHistory
 "
 undoHistory reinitialize
 !
 undoLast
+"undo last action
+"
 self unselect.
-undoHistory undoLast:1.
+self withSelectionHiddenDo:[
+undoHistory undoLast:1
+].
 self changed:#tree
 ! !
 !UIObjectView::UndoHistory class methodsFor:'constants'!

changeset 61	85ef247db6b1
parent 60	7542ab7fbbfe
child 63	6714daee4b26