hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:6fe6c4d1672e
+:1854c2e61c4e
 !UIObjectView class methodsFor:'queries'!
 layoutType:aView
 "returns layout type of aView or nil
 "
-|layout spec|
+|layout spec superView|
-layout := aView geometryLayout.
+aView notNil ifTrue:[
+layout := aView geometryLayout.
 layout notNil ifTrue:[
 layout isLayout ifTrue:[
 layout isLayoutFrame        ifTrue:[ ^ #LayoutFrame ].
 layout isAlignmentOrigin    ifTrue:[ ^ #AlignmentOrigin ].
 layout isLayoutOrigin       ifTrue:[ ^ #LayoutOrigin ].
+] ifFalse:[
+layout isRectangle          ifTrue:[ ^ #Rectangle ].
+layout isPoint              ifTrue:[ ^ #Point ].
+]
 ] ifFalse:[
-layout isRectangle          ifTrue:[ ^ #Rectangle ].
+(superView := aView superView) notNil ifTrue:[
-layout isPoint              ifTrue:[ ^ #Point ].
+spec := superView specClass.
+spec canResizeSubComponents ifTrue:[
+^ #Extent
+]
+]
 ]
-] ifFalse:[
-spec := aView superView specClass.
-spec canResizeSubComponents     ifTrue:[ ^ #Extent ].
 ].
 ^ nil
 "Modified: 28.2.1997 / 13:02:16 / cg"
 ! !
 !UIObjectView methodsFor:'accessing'!
+canModify
+^ testMode not
+!
+canModify:aBool
+self testMode:(aBool not)
+!
 gridAlign
 "returns state of aligning to grid
 "
 ^ aligning
 self unselect.
 inputView unrealize
 ] ifFalse:[
 inputView raise.
 inputView realize
-]
+].
+self changed:#canModify
 ]
 ! !
 object := actionData object.
 self invertOutlineOf:object.
 inputView raise.
 self setupInitialLayoutFor:object.
-self changed:#tree.
 self select:object.
 actionData := nil.
 self setDefaultActions.
 addToSelection:something
 "add something to selection
 "
 (self canSelect:something) ifTrue:[
 super addToSelection:something.
-self changed:#selection.
+self selectionChanged.
 ]
 !
 numberOfSelections
 "return the number of selected entries
 !
 removeFromSelection:something
 "remove something from selection
 "
-super removeFromSelection:something.
+something notNil ifTrue:[
-self changed:#selection
+super removeFromSelection:something.
+self selectionChanged
+].
 !
 select:something
 "change selection to something
 "
 (self canSelect:something) ifTrue:[
 super select:something.
-self changed:#selection
+self selectionChanged
 ]
 !
 selection
 "returns selection
 "
 ^ selection
+!
+selectionChanged
+"called whenever the selection changed
+"
+self subclassResponsibility
 !
 showSelection
 selectionHiddenLevel == 0 ifTrue:[
 unselect
 "clear selection
 "
 selection notNil ifTrue:[
 super unselect.
-self changed:#selection
+self selectionChanged
 ]
 !
 withSelectionHiddenDo:aBlock
 "apply block with selection hidden (no handles)
 ! !
 !UIObjectView methodsFor:'user actions - move'!
-moveSelectionDown:aNumber
+moveSelectionDown
 "move selection down
 "
-|gridY|
+|gridY n|
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridY := gridAlign y].
 self withSelectionHiddenDo:[
-self transaction:#moveDown selectionDo:[:aView|
+self selectionDo:[:aView|
-|n d|
-n := aNumber.
 aligning ifTrue:[
-d := ((aView computeCorner y) \\ gridY).
+n := ((aView computeCorner y) \\ gridY).
-n := n * gridY.
+n ~~ 0 ifTrue:[
-d ~~ 0 ifTrue:[
+n := gridY - n + 1.
-n := n - d + 1.
+] ifFalse:[
+n := gridY
 ]
+] ifFalse:[
+n := 1
 ].
 self shiftLayout:aView top:n bottom:n
 ]
 ].
 self changed:#layout
 ]
 !
-moveSelectionLeft:aNumber
+moveSelectionLeft
 "move selection left
 "
-|gridX|
+|gridX n|
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridX := gridAlign x].
 self withSelectionHiddenDo:[
-self transaction:#moveLeft selectionDo:[:aView|
+self selectionDo:[:aView|
-|n d|
-n := aNumber.
 aligning ifTrue:[
-d := ((aView computeOrigin x) \\ gridX).
+n := ((aView computeOrigin x) \\ gridX).
-d ~~ 0 ifTrue:[
+n == 0 ifTrue:[n := gridX].
-n := n-1.
+n := n negated.
-].
+] ifFalse:[
-n := (n * gridX) + d.
+n := -1
-].
-n := n negated.
-self shiftLayout:aView left:n right:n
-]
-].
-self changed:#layout
-]
-!
-moveSelectionRight:aNumber
-"move selection right
-"
-|gridX|
-(self canMove:selection) ifTrue:[
-gridAlign notNil ifTrue:[gridX := gridAlign x].
-self withSelectionHiddenDo:[
-self transaction:#moveRight selectionDo:[:aView|
-|n d|
-n := aNumber.
-aligning ifTrue:[
-d := ((aView computeCorner x) \\ gridX).
-n := n * gridX.
-d ~~ 0 ifTrue:[
-n := n - d + 1.
-]
 ].
 self shiftLayout:aView left:n right:n
 ]
 ].
 self changed:#layout
 ]
 !
-moveSelectionUp:aNumber
+moveSelectionRight
+"move selection right
+"
+|gridX n|
+(self canMove:selection) ifTrue:[
+gridAlign notNil ifTrue:[gridX := gridAlign x].
+self withSelectionHiddenDo:[
+self selectionDo:[:aView|
+aligning ifTrue:[
+n := ((aView computeCorner x) \\ gridX).
+n ~~ 0 ifTrue:[n := n negated]
+ifFalse:[n := gridX]
+] ifFalse:[
+n := 1
+].
+self shiftLayout:aView left:n right:n
+]
+].
+self changed:#layout
+]
+!
+moveSelectionUp
 "move selection up
 "
-|gridY|
+|gridY n|
 (self canMove:selection) ifTrue:[
 gridAlign notNil ifTrue:[gridY := gridAlign y].
 self withSelectionHiddenDo:[
-self transaction:#moveUp selectionDo:[:aView|
+self selectionDo:[:aView|
-|n d|
-n := aNumber.
 aligning ifTrue:[
-d := ((aView computeOrigin x) \\ gridY).
+n := ((aView computeOrigin x) \\ gridY).
-d ~~ 0 ifTrue:[
+n == 0 ifTrue:[n := gridY].
-n := n-1.
+n := n negated.
-].
+] ifFalse:[
-n := (n * gridY) + d.
+n := -1
 ].
-n := n negated.
 self shiftLayout:aView top:n bottom:n
 ]
 ].
 self changed:#layout
 ]
 self unselect.
 self withSelectionHiddenDo:[
 undoHistory openUndoMenu
 ].
-self changed:#tree
 !
 removeUndoHistory
 "delete total undo history
 self unselect.
 self withSelectionHiddenDo:[
 undoHistory undoLast:1
 ].
-self changed:#tree
 ! !
 !UIObjectView::UndoHistory class methodsFor:'constants'!
 maxHistorySize

changeset 113	1854c2e61c4e
parent 100	01775d3d8489
child 119	39acd704ad51