hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:407d25aca670
+:a5a7054e2b7d
 "Modified: 5.9.1995 / 12:25:25 / claus"
 !
+minSetOfSuperViews:aCollectionOfViews
+|setOfViews setOfSuperViews|
+aCollectionOfViews isCollection ifFalse:[
+^ aCollectionOfViews
+].
+setOfViews := aCollectionOfViews asIdentitySet.
+setOfSuperViews := setOfViews select:[:aView|
+(setOfViews detect:[:v|aView isComponentOf:v]
+ifNone:nil
+) isNil
+].
+setOfSuperViews size == 1 ifTrue:[
+^ setOfSuperViews first
+].
+^ setOfSuperViews asOrderedCollection
+!
 setDefaultActions
 "set default actions
 "
 pressAction      := [:pressPoint | self startSelectOrMove:pressPoint].
 shiftPressAction := [:pressPoint | self startSelectMoreOrMove:pressPoint].
 "prepare move operation for an object
 "
 motionAction := [:movePoint|
-(aPoint dist:movePoint) > 4.0 ifTrue:[
+(aPoint dist:movePoint) > 8.0 ifTrue:[
 self startObjectMoveAt:aPoint
 ]
 ].
 ! !
 |object|
 object := self singleSelection.
 self actionResize:object selector:b.
-self transaction:#extent selectionDo:[:aView|
+self transaction:#resize selectionDo:[:aView|
 self undoLayoutView:aView
 ].
 super unselect.
 motionAction  := [:movePoint | self doDragResize:movePoint].
 ].
 aBlock valueNowOrOnUnwindDo:[
 selectionHiddenLevel == 1 ifTrue:[
 setOfSuperViewsSizeChanged notEmpty ifTrue:[
-setOfSuperViewsSizeChanged do:[:aSuperView|
+|s|
-aSuperView sizeChanged:nil
+s := self minSetOfSuperViews:setOfSuperViewsSizeChanged.
+s isCollection ifTrue:[
+s do:[:aSuperView|aSuperView sizeChanged:nil]
+] ifFalse:[
+s sizeChanged:nil
 ].
 setOfSuperViewsSizeChanged := IdentitySet new
 ].
 self selectionDo:[:aView| self showSelected:aView].
 ].
 pasteExtent
 "paste the copied extent to all objects in the selection
 "
 copiedExtent notNil ifTrue:[
-self transition:#extent dimensionDo:[:v|
+self transition:#pasteExtent 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 transition:#pasteHeight 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 transition:#pasteWidth dimensionDo:[:v|
 self resize:v right:(v computeOrigin + copiedExtent)
 ]
 ]
 !
 !
 setExtent:anExtent
 "change extent for all selected objects
 "
-self transition:#layout dimensionDo:[:v|
+self transition:#extent dimensionDo:[:v|
 v geometryLayout:nil.
 v extent:anExtent.
 ].
 "Modified: 28.2.1997 / 12:49:00 / cg"
 !
 setToDefaultExtent
 "change extent of all selected views to their default extent
 "
-self transition:#extent dimensionDo:[:v|
+self transition:#defaultExtent 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 transition:#defaultHeight 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 transition:#defaultWidth dimensionDo:[:v|
 self resize:v right:(v computeOrigin + (v preferredExtent))
 ]
 !
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridY := gridAlign y].
 self withSelectionHiddenDo:[
-self transaction:#move selectionDo:[:aView|
+self transaction:#moveDown selectionDo:[:aView|
 |n d|
 n := aNumber.
 aligning ifTrue:[
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridX := gridAlign x].
 self withSelectionHiddenDo:[
-self transaction:#move selectionDo:[:aView|
+self transaction:#moveLeft selectionDo:[:aView|
 |n d|
 n := aNumber.
 aligning ifTrue:[
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridX := gridAlign x].
 self withSelectionHiddenDo:[
-self transaction:#move selectionDo:[:aView|
+self transaction:#moveRight selectionDo:[:aView|
 |n d|
 n := aNumber.
 aligning ifTrue:[
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridY := gridAlign y].
 self withSelectionHiddenDo:[
-self transaction:#move selectionDo:[:aView|
+self transaction:#moveUp selectionDo:[:aView|
 |n d|
 n := aNumber.
 aligning ifTrue:[
 ! !
 !UIObjectView methodsFor:'user actions - position'!
-alignFrameLayout:aBlock
-"perform block on a frameLayout assigned to the current single selection
-"
-|layout|
-self transaction:#align selectionDo:[:aView|
-layout := self class asLayoutFrameFromView:aView.
-layout notNil ifTrue:[
-self undoLayoutView:aView.
-aBlock value:layout.
-aView geometryLayout:layout.
-self elementChangedSize:aView.
-]
-]
-!
 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|
 (self canMove:selection) ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 bmost := (selection at:1) computeCorner y.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignBottom selectionDo:[:v|
 (delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
 self shiftLayout:v top:delta bottom:delta.
 ]
 ]
 ] ifFalse:[
-self alignFrameLayout:[:aLayout|
+self extentToFrame:#Bottom do:[:aLayout|
 aLayout bottomOffset:0.
 aLayout bottomFraction:1.0
 ]
 ]
 ].
 view   := selection at:1.
 center := view computeCorner + view computeOrigin.
 ].
 center := center x // 2.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignCenterHorizontal selectionDo:[:v|
 |newX oldX delta|
 oldX  := v computeOrigin x.
 newX  := center - ((v computeCorner x - oldX) // 2).
 delta := newX - oldX.
 view   := selection at:1.
 center := view computeCorner + view computeOrigin.
 ].
 center := center y // 2.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignCenterVertical selectionDo:[:v|
 |newY oldY delta|
 oldY  := v computeOrigin y.
 newY  := center - ((v computeCorner y - oldY) // 2).
 delta := newY - oldY.
 (self canMove:selection) ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 lmost := (selection at:1) computeOrigin x.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignLeft selectionDo:[:v|
 (delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
 self shiftLayout:v left:delta right:delta
 ]
 ]
 ] ifFalse:[
-self alignFrameLayout:[:aLayout|
+self extentToFrame:#Left do:[:aLayout|
 aLayout leftOffset:0.
 aLayout leftFraction:0.0.
 ]
 ]
 ].
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 lmost := (selection at:1) computeOrigin x.
 rmost := (selection at:1) computeCorner x.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignLeftRight selectionDo:[:aView|
-self shiftLayout:v left:(lmost - (v computeOrigin x))
+|layout|
-right:(rmost - (v computeCorner x)).
+layout := self class asLayoutFrameFromView:aView.
-self elementChangedSize:v.
+layout notNil ifTrue:[
+self undoLayoutView:aView.
+aView geometryLayout:layout.
+undoHistory disabledTransitionDo:[
+self shiftLayout:aView left:(lmost - (aView computeOrigin x))
+right:(rmost - (aView computeCorner x)).
+].
+self elementChangedSize:aView
+]
 ]
 ] ifFalse:[
-self alignFrameLayout:[:aLayout|
+self extentToFrame:#LeftRight do:[:aLayout|
 aLayout leftOffset:0.
 aLayout leftFraction:0.0.
 aLayout rightOffset:0.
 aLayout rightFraction:1.0.
 ]
 (self canMove:selection) ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 rmost := (selection at:1) computeCorner x.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignRight selectionDo:[:v|
 (delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
 self shiftLayout:v left:delta right:delta
 ]
 ]
 ] ifFalse:[
-self alignFrameLayout:[:aLayout|
+self extentToFrame:#Right do:[:aLayout|
 aLayout rightOffset:0.
 aLayout rightFraction:1.0.
 ]
 ]
 ].
 (self canMove:selection) ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 tmost := (selection at:1) computeOrigin y.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignTop selectionDo:[:v|
 (delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
 self shiftLayout:v top:delta bottom:delta
 ]
 ]
 ] ifFalse:[
-self alignFrameLayout:[:aLayout|
+self extentToFrame:#Top do:[:aLayout|
 aLayout topOffset:0.
 aLayout topFraction:0.0.
 ]
 ]
 ].
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
 tmost := (selection at:1) computeOrigin y.
 bmost := (selection at:1) computeCorner y.
-self transaction:#align selectionDo:[:v|
+self transaction:#alignTopBottom selectionDo:[:aView|
-self shiftLayout:v top:(tmost - (v computeOrigin y))
+|layout|
-bottom:(bmost - (v computeCorner y)).
+layout := self class asLayoutFrameFromView:aView.
-self elementChangedSize:v.
+layout notNil ifTrue:[
+self undoLayoutView:aView.
+aView geometryLayout:layout.
+undoHistory disabledTransitionDo:[
+self shiftLayout:aView top:(tmost - (aView computeOrigin y))
+bottom:(bmost - (aView computeCorner y)).
+].
+self elementChangedSize:aView
+]
 ]
 ] ifFalse:[
-self alignFrameLayout:[:aLayout|
+self extentToFrame:#TopBottom do:[:aLayout|
 aLayout topOffset:0.
 aLayout topFraction:0.0.
 aLayout bottomOffset:0.
 aLayout bottomFraction:1.0.
 ]
 ]
 ].
 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.
 val := aOneArgBlockXorY value:(superview computeExtent).
 max := (min + val - max) // 2.
 max == min ifFalse:[
+|type|
+(orientation == #y) ifTrue:[type := #centerVertical]
+ifFalse:[type := #centerHorizontal].
 delta := max - min.
-self transaction:#center selectionDo:[:v|
+self transaction:type selectionDo:[:v|
 orientation == #y ifTrue:[
 self shiftLayout:v top:delta bottom:delta
 ] ifFalse:[
 self shiftLayout:v left:delta right:delta
 ]
 "center selection vertical
 "
 self centerSelection:[:aPoint| aPoint y] orientation:#y
 !
+extentToFrame:toWhat do:aBlock
+"align to frame (Left Right ...) and perform the block on a frameLayout
+"
+|layout type|
+type := ('extent', toWhat asString) asSymbol.
+self transaction:type selectionDo:[:aView|
+layout := self class asLayoutFrameFromView:aView.
+layout notNil ifTrue:[
+self undoLayoutView:aView.
+aBlock value:layout.
+aView geometryLayout:layout.
+self elementChangedSize:aView.
+]
+]
+!
 spreadSelectionHor
 "spread multiple selection horizontal
 "
 |sumWidths min max viewsInOrder topsInOrder count space|
 topsInOrder  := viewsInOrder collect:[:aView | aView left].
 topsInOrder sortWith:viewsInOrder.
 space := (((max - min) - sumWidths) / (count - 1)) rounded asInteger.
-self transaction:#spread objects:viewsInOrder do:[:aView|
+self transaction:#spreadHorizontal objects:viewsInOrder do:[:aView|
 |delta|
 delta := min - aView computeOrigin x.
 self shiftLayout:aView left:delta right:delta.
 min := min + aView computeExtent x + space
 topsInOrder  := viewsInOrder collect:[:aView|aView top].
 topsInOrder sortWith:viewsInOrder.
 space := (((max - min) - sumHeights) / (count - 1)) rounded asInteger.
-self transaction:#spread objects:viewsInOrder do:[:aView|
+self transaction:#spreadVertical objects:viewsInOrder do:[:aView|
 |delta|
 delta := min - aView computeOrigin y.
 self shiftLayout:aView top:delta bottom:delta.
 min := min + aView height + space
 self changed:#layout
 ! !
 !UIObjectView methodsFor:'user actions - undo history'!
+enableUndoHistory:aState
+"enable or disable undo history
+"
+undoHistory enabled:aState
+!
 openUndoMenu
 "open undo menu
 "
 self unselect.
 ! !
 !UIObjectView::UndoHistory methodsFor:'accessing'!
+enabled
+^ enabled
+!
+enabled:aState
+enabled := aState
+!
 historySize
 ^ history size
+!
+lastTypeAsString
+"returns type of last undo asString or nil
+"
+history notEmpty ifTrue:[
+^ history last typeAsString
+].
+^ nil
 ! !
 !UIObjectView::UndoHistory methodsFor:'initialization'!
 initialize
 ! !
 !UIObjectView::UndoHistory methodsFor:'menu'!
 openUndoMenu
-|list top slv hzp inset selection okButton|
+|list tabs top slv hzp inset selection okButton|
 history isEmpty ifTrue:[
 ^ self
 ].
 inset := hzp preferredExtent y.
 hzp topInset:(inset negated).
 slv   bottomInset:inset.
 slv := slv scrolledView.
+tabs := TabulatorSpecification new.
+tabs unit:#cm.
+tabs positions:#(0 5).
+tabs align:#(#left ##left).
 list := history collect:[:aTrans||e|
 e := MultiColListEntry new.
-e colAt:1 put:(aTrans type asString).
+e colAt:1 put:(aTrans typeAsString).
 e colAt:2 put:(aTrans text ? '').
+e tabulatorSpecification:tabs.
 e
 ].
 slv list:list.
 slv action:[:index | selection := index ].
 ! !
 !UIObjectView::UndoHistory::Transaction methodsFor:'accessing'!
-asString
-"returns printable string
-"
-|string|
-string := type asString.
-text notNil ifTrue:[^ string, '    ', text ]
-ifFalse:[^ string ]
-!
 text
 "returns text or nil assigned to transition
 "
 ^ text
 !
 type:aType
 "change type assigned to transition
 "
 type := aType
+!
+typeAsString
+"returns type as printable string
+"
+|line name size sep|
+line := type asString.
+size := 0.
+line do:[:c| (c isUppercase) ifTrue:[size := size+1] ].
+name := String new:(line size + size).
+size := 1.
+sep  := Character space.
+line do:[:c|
+(c isUppercase) ifFalse:[
+name at:size put:c
+] ifTrue:[
+name at:size put:sep.
+sep  := $&.
+size := size + 1.
+name at:size put:(c asLowercase)
+].
+size := size + 1
+].
+^ name
 ! !
 !UIObjectView::UndoHistory::Transaction methodsFor:'add & undo'!
 add:anUndoBlock

changeset 72	a5a7054e2b7d
parent 68	889c3877baf0
child 76	c9c4254a9ee5