hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:95070ea7ae42
+:9779b7459a1c
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:UIObjectView::UndoHistory
 !
+!UIObjectView class methodsFor:'documentation'!
+documentation
+"
+buildIn view used by the UIPainter; from this view, the layout of the
+new application derives from.
+[see also:]
+UIBuilder
+UIPainterView
+"
+! !
 !UIObjectView class methodsFor:'conversion'!
 asLayoutFrameFromView:aView
 "convert layout from aView to a frameLayout. On success the frameLayout is
 enabled:aState
 "set the modification / test mode
 "
 (aState == enableChannel value) ifFalse:[
 aState ifFalse:[
-saveSelection := selection copy
+saveSelection := self selection copy.
-].
-enableChannel value:aState.
-aState ifFalse:[
 self unselect.
-inputView unrealize
+enableChannel value:aState.
+inputView unrealize.
 ] ifTrue:[
 inputView raise.
 inputView realize.
+enableChannel value:aState.
 self select:saveSelection.
 ]
 ]
 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.
-"/    selectionHiddenLevel == 0 ifTrue:[
+self selectionDo:[:v | self showSelected:v]
-self selectionDo:[:v | self showSelected:v]
-"/    ]
 !
 keyPress:key x:x y:y
 "any key pressed
 ^ self deleteSelection
 ].
 key == #Copy  ifTrue:[ ^ self copySelection].
 key == #Paste ifTrue:[ ^ self pasteBuffer].
-super keyPress:key x:x y:y
 !
 processEvent:anEvent
 "catch expose events for components, and redraw its handles after
 the redraw when this happens
 "
-|view|
+(anEvent type == #damage and:[self isSelected:(anEvent view)]) ifTrue:[
+self showSelected:(anEvent view)
-selection notNil ifTrue:[
-anEvent type == #damage ifTrue:[
-view := anEvent view.
-(selection == view
-or:[selection isCollection
-and:[selection includes:view]]) ifTrue:[
-self showSelected:view
-]
-]
 ].
 ^ false.
 !
 endObjectMove
 "cleanup after object(s) move
 "
 movedObject notNil ifTrue:[
-movedObject do:[:aView|
+movedObject do:[:aView|self invertOutlineOf:aView].
-self invertOutlineOf:aView
-].
-movedObject do:[:aView|
-self showSelected:aView
-].
 movedObject size == 1 ifTrue:[
-selection := movedObject at:1
+movedObject := movedObject first
-] ifFalse:[
+].
-selection := movedObject
-].
+self setSelection:movedObject withRedraw:true.
 movedObject := nil.
 self setDefaultActions.
 self changed:#layout.
 ].
 !
 !
 startObjectMoveAt:aPoint
 "start object(s) move at a point
 "
-self startObjectMove:selection at:aPoint.
+self startObjectMove:(self selection) at:aPoint.
+movedObject := self selection.
-selection isCollection ifTrue:[
-movedObject := selection
+movedObject isCollection ifFalse:[
-] ifFalse:[
+movedObject := Array with:movedObject
-movedObject := Array with:selection
+].
-].
+self setSelection:nil withRedraw:true.
-super unselect.
 moveDelta := movedObject collect:[:aView|
 aPoint - aView computeOrigin
 ].
 (aView := self findObjectAt:aPoint) isNil ifTrue:[
 ^ self unselect
 ].
 (self canMove:aView) ifFalse:[
-super unselect.
+^ self select:aView
-^ self select:aView
 ]
 ].
 (self isSelected:aView) ifFalse:[
-super unselect.
 self select:aView.
 ].
 (self numberOfSelections ~~ 1) ifTrue:[
 releaseAction := [
 actionData := nil.
 self invertOutlineOf:object.
 self setDefaultActions.
 self elementChangedSize:object.
-super select:object.
+self setSelection:object withRedraw:true.
 self changed:#layout.
 !
 startResizeBorder:b of:selection
 "resize selected view
 self actionResize:object selector:b.
 self transaction:#resize selectionDo:[:aView|
 self undoLayoutView:aView
 ].
-super unselect.
+self setSelection:nil withRedraw:true.
 motionAction  := [:movePoint | self doDragResize:movePoint].
 releaseAction := [self endResize].
 self invertOutlineOf:object
 ! !
 ! !
 !UIObjectView methodsFor:'selections'!
-addToSelection:something
+addToSelection:anObject
-"add something to selection
+"add anObject to selection
 "
-(self canSelect:something) ifTrue:[
+|coll|
-super addToSelection:something.
-self selectionChanged.
+self enabled ifTrue:[
-]
+self hasSelection ifFalse:[
+self select:anObject
+] ifTrue:[
+(self isSelected:anObject) ifFalse:[
+(coll := self selection) isCollection ifFalse:[
+coll := OrderedCollection with:coll
+].
+coll add:anObject.
+self setSelection:coll withRedraw:false.
+self showSelected:anObject.
+self selectionChanged.
+]
+]
+]
+!
+moveableSelection
+"tests whether all selected objects are moveable and in case
+of true the selection is returned, otherwise nil
+"
+|coll|
+self hasSelection ifTrue:[
+(self canMove:(coll := self selection)) ifTrue:[
+^ coll
+]
+].
+^ nil
 !
 numberOfSelections
 "return the number of selected entries
 "
-|sz|
+|coll size|
-selection isNil ifTrue:[^ 0].
+coll := self selection.
+size := coll size.
-selection isCollection ifTrue:[^ selection size]
-ifFalse:[^ 1 ]
+(size ~~ 0 or:[coll isNil]) ifTrue:[^ size].
-!
+^ 1
+!
-removeFromSelection:something
-"remove something from selection
+removeFromSelection:anObject
-"
+"remove anObject from selection
-something notNil ifTrue:[
+"
-super removeFromSelection:something.
+|sel|
-self selectionChanged
-].
+(self isSelected:anObject) ifFalse:[
+^ self
+].
+sel := self selection.
+sel size > 1 ifTrue:[
+sel := sel copy.
+sel remove:anObject ifAbsent:nil.
+] ifFalse:[
+sel := nil
+].
+self setSelection:sel withRedraw:true.
+self selectionChanged.
 !
 select:something
 "change selection to something
 "
-(self canSelect:something) ifTrue:[
+(self enabled and:[something ~= self selection]) ifTrue:[
-super select:something.
+self setSelection:something withRedraw:true.
 self selectionChanged
 ]
 "
 self subclassResponsibility
 !
+selectionDo:aBlock
+"apply block to every selected object
+"
+self forEach:(self selection) do:aBlock
+!
+setSelection:aNewSelection withRedraw:doRedraw
+"set a new selection
+"
+doRedraw ifTrue:[
+self hideSelection.
+selection := aNewSelection.
+self showSelection
+] ifFalse:[
+selection := aNewSelection
+]
+!
 showSelection
+"show the selection - draw handles
+"
 selectionHiddenLevel == 0 ifTrue:[
-super showSelection.
+self selectionDo:[:el| self showSelected:el ]
 ].
 !
 singleSelection
 "returns single selection or nil
 "
-selection isCollection ifFalse:[
+|coll|
-^ selection
-].
+(coll := self selection) isCollection ifFalse:[
-selection size == 1 ifTrue:[ ^ selection at:1]
+^ coll
-ifFalse:[ ^ nil].
+].
+coll size == 1 ifTrue:[ ^ coll first].
+^ nil
 !
 singleSelectionDo:aBlock
 "perform block with argument a view in case of one selection
 "
 !
 unselect
 "clear selection
 "
-selection notNil ifTrue:[
+self select:nil
-super unselect.
-self selectionChanged
-]
 !
 withSelectionHiddenDo:aBlock
 "apply block with selection hidden (no handles)
 "
 withoutSelectionDo:aBlock
 "evaluate aBlock while selection is nilled
 "
 |sel|
-selection isNil ifTrue:[
+self hasSelection ifFalse:[
 aBlock value
-] ifFalse:[
+] ifTrue:[
-sel := selection.
+sel := self selection.
-super unselect.
+self setSelection:nil withRedraw:true.
 aBlock value.
-super select:sel
+self setSelection:sel withRedraw:true.
 ]
 ! !
 ^ false
 "Modified: 8.4.1997 / 01:19:14 / cg"
 !
-canSelect:something
+hasSelection
-"returns true if something can be selected and enabled is true
+"returns true if any selected object exists
 "
-^ (self enabled and:[something ~~ selection])
+^ self numberOfSelections ~~ 0
 !
 hasUndos
 "returns true if undoHistory not empty
 isHorizontalResizable:aComponent
 "returns true if instance is horizontal resizeable
 "
 ^ self subclassResponsibility
+!
+isSelected:anObject
+"return true, if the argument, anObject is selected
+"
+anObject notNil ifTrue:[
+self selectionDo:[:el| el == anObject ifTrue:[^ true]]
+].
+^ false
 !
 isVerticalResizable:aComponent
 "returns true if instance is vertical resizeable
 transaction:aType selectionDo:aOneArgBlock
 "opens a transaction and evaluates a block within the transaction; the
 argument to the block is a view from the selection
 "
-self transaction:aType objects:selection do:aOneArgBlock
+self transaction:aType objects:(self selection) do:aOneArgBlock
 !
 undoLayoutView:aView
 !UIObjectView methodsFor:'user actions - move'!
 moveSelectionDown
 "move selection down
 "
-|gridY n|
+|gridY n sel|
-(self canMove:selection) ifTrue:[
+self moveableSelection notNil ifTrue:[
 gridAlign notNil ifTrue:[gridY := gridAlign y].
 self withSelectionHiddenDo:[
 self selectionDo:[:aView|
 aligning ifTrue:[
 moveSelectionLeft
 "move selection left
 "
 |gridX n|
-(self canMove:selection) ifTrue:[
+self moveableSelection notNil ifTrue:[
 gridAlign notNil ifTrue:[gridX := gridAlign x].
 self withSelectionHiddenDo:[
 self selectionDo:[:aView|
 aligning ifTrue:[
 moveSelectionRight
 "move selection right
 "
 |gridX n|
-(self canMove:selection) ifTrue:[
+self moveableSelection notNil ifTrue:[
 gridAlign notNil ifTrue:[gridX := gridAlign x].
 self withSelectionHiddenDo:[
 self selectionDo:[:aView|
 aligning ifTrue:[
 moveSelectionUp
 "move selection up
 "
 |gridY n|
-(self canMove:selection) ifTrue:[
+self moveableSelection notNil ifTrue:[
 gridAlign notNil ifTrue:[gridY := gridAlign y].
 self withSelectionHiddenDo:[
 self selectionDo:[:aView|
 aligning ifTrue:[
 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|
+|bmost delta sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
-bmost := (selection at:1) computeCorner y.
+bmost := (sel first) computeCorner y.
 self transaction:#alignBottom selectionDo:[:v|
 (delta := bmost - (v computeCorner y)) ~~ 0 ifTrue:[
 self shiftLayout:v top:delta bottom:delta.
 ]
 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|
+|view center sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 view := self singleSelection.
 view notNil ifTrue:[
 view   := view superView.
 center := view computeExtent
 ] ifFalse:[
-view   := selection at:1.
+view   := sel first.
 center := view computeCorner + view computeOrigin.
 ].
 center := center x // 2.
 self transaction:#alignCenterHorizontal selectionDo:[:v|
 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|
+|view center sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 view := self singleSelection.
 view notNil ifTrue:[
 view   := view superView.
 center := view computeExtent
 ] ifFalse:[
-view   := selection at:1.
+view   := sel first.
 center := view computeCorner + view computeOrigin.
 ].
 center := center y // 2.
 self transaction:#alignCenterVertical selectionDo:[:v|
 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|
+|lmost delta sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
-lmost := (selection at:1) computeOrigin x.
+lmost := (sel first) computeOrigin x.
 self transaction:#alignLeft selectionDo:[:v|
 (delta := lmost - (v computeOrigin x)) ~~ 0 ifTrue:[
 self shiftLayout:v left:delta right:delta
 ]
 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|
+|lmost rmost sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
-lmost := (selection at:1) computeOrigin x.
+lmost := (sel first) computeOrigin x.
-rmost := (selection at:1) computeCorner x.
+rmost := (sel first) computeCorner x.
 self transaction:#alignLeftRight selectionDo:[:aView|
 |layout|
 layout := self class asLayoutFrameFromView:aView.
 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|
+|rmost delta sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
-rmost := (selection at:1) computeCorner x.
+rmost := (sel first) computeCorner x.
 self transaction:#alignRight selectionDo:[:v|
 (delta := rmost - (v computeCorner x)) ~~ 0 ifTrue:[
 self shiftLayout:v left:delta right:delta
 ]
 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|
+|tmost delta sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
-tmost := (selection at:1) computeOrigin y.
+tmost := (sel first) computeOrigin y.
 self transaction:#alignTop selectionDo:[:v|
 (delta := tmost - (v computeOrigin y)) ~~ 0 ifTrue:[
 self shiftLayout:v top:delta bottom:delta
 ]
 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|
+|tmost bmost sel|
-(self canMove:selection) ifTrue:[
+(sel := self moveableSelection) notNil ifTrue:[
 self withSelectionHiddenDo:[
 self numberOfSelections > 1 ifTrue:[
-tmost := (selection at:1) computeOrigin y.
+tmost := (sel first) computeOrigin y.
-bmost := (selection at:1) computeCorner y.
+bmost := (sel first) computeCorner y.
 self transaction:#alignTopBottom selectionDo:[:aView|
 |layout|
 layout := self class asLayoutFrameFromView:aView.
 "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 canMove:selection) ifFalse:[
+(self moveableSelection) isNil ifTrue:[
 ^ self
 ].
 self withSelectionHiddenDo:[
 max := 0.
 !
 spreadSelectionHor
 "spread multiple selection horizontal
 "
-|sumWidths min max viewsInOrder topsInOrder count space|
+|sumWidths min max viewsInOrder topsInOrder count space sel|
-(self numberOfSelections > 1 and:[self canMove:selection]) ifFalse:[
+sel := self moveableSelection.
+(sel notNil and:[self numberOfSelections > 1]) ifFalse:[
 ^ self
 ].
 self withSelectionHiddenDo:[
 count := 0.
 ifFalse:[min := min min:(aView left)].
 max := max max:(aView right).
 count := count + 1
 ].
-viewsInOrder := Array withAll:selection.
+viewsInOrder := Array withAll:sel.
 topsInOrder  := viewsInOrder collect:[:aView | aView left].
 topsInOrder sortWith:viewsInOrder.
 space := (((max - min) - sumWidths) / (count - 1)) rounded asInteger.
 !
 spreadSelectionVer
 "spread multiple selection vertical
 "
-|sumHeights min max viewsInOrder topsInOrder count space|
+|sumHeights min max viewsInOrder topsInOrder count space sel|
-(self numberOfSelections > 1 and:[self canMove:selection]) ifFalse:[
+sel := self moveableSelection.
+(sel notNil and:[self numberOfSelections > 1]) ifFalse:[
 ^ self
 ].
 self withSelectionHiddenDo:[
 count := 0.
 ifFalse:[min := min min:(aView top)].
 max   := max max:(aView bottom).
 count := count + 1
 ].
-viewsInOrder := Array withAll:selection.
+viewsInOrder := Array withAll:sel.
 topsInOrder  := viewsInOrder collect:[:aView|aView top].
 topsInOrder sortWith:viewsInOrder.
 space := (((max - min) - sumHeights) / (count - 1)) rounded asInteger.

changeset 128	9779b7459a1c
parent 123	421d412e797b
child 131	715b3dbba87d