hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:0e87610c2768
+:0b0b4d99e3e7
 ObjectView subclass:#UIObjectView
 	instanceVariableNames:'saveSelection inputView enableChannel undoHistory copiedExtent
-		copiedLayout actionData createClass clipChildren
+		copiedLayout resizeData clipChildren selectionHiddenLevel
-		selectionHiddenLevel setOfSuperViewsSizeChanged'
+		setOfSuperViewsSizeChanged'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 hitDelta
 ^ 4
 ! !
+!UIObjectView class methodsFor:'handles'!
+handlesOf:aView do:aBlock
+|type v h|
+type := self layoutType:aView.
+(type == #LayoutFrame or:[type == #Rectangle]) ifTrue:[
+v := self isVerticalResizable:aView.
+h := self isHorizontalResizable:aView.
+h ifTrue:[  aBlock value:(aView leftCenter ) value:#left.
+aBlock value:(aView rightCenter) value:#right.
+].
+v ifTrue:[  aBlock value:(aView topCenter   ) value:#top.
+aBlock value:(aView bottomCenter) value:#bottom.
+].
+(h and:[v]) ifTrue:[
+aBlock value:(aView origin    ) value:#origin.
+aBlock value:(aView topRight  ) value:#topRight.
+aBlock value:(aView bottomLeft) value:#bottomLeft.
+aBlock value:(aView corner    ) value:#corner.
+^ self
+]
+].
+aBlock value:(aView origin    ) value:#view.
+aBlock value:(aView topRight  ) value:#view.
+aBlock value:(aView bottomLeft) value:#view.
+type == #Extent ifTrue:[
+v := self isVerticalResizable:aView.
+h := self isHorizontalResizable:aView.
+v ifTrue:[aBlock value:(aView bottomCenter) value:#bottom].
+h ifTrue:[aBlock value:(aView rightCenter ) value:#right ].
+(h and:[v]) ifTrue:[
+aBlock value:(aView corner) value:#corner.
+^ self
+]
+].
+aBlock value:(aView corner) value:#view.
+! !
 !UIObjectView class methodsFor:'queries'!
+isHorizontalResizable:aComponent
+"returns true if instance is horizontal resizeable
+"
+(aComponent isKindOf:ScrollBar) ifTrue:[
+^ aComponent orientation == #horizontal
+].
+(aComponent isKindOf:Scroller) ifTrue:[
+^ aComponent orientation == #horizontal
+].
+(aComponent isKindOf:Slider) ifTrue:[
+^ aComponent orientation == #horizontal
+].
+^ true
+!
+isVerticalResizable:aComponent
+"returns true if instance is vertical resizeable
+"
+(aComponent isKindOf:EditField) ifTrue:[
+^ false
+].
+(aComponent isKindOf:ComboBoxView) ifTrue:[
+^ false
+].
+(aComponent isKindOf:CheckBox) ifTrue:[
+^ false
+].
+(aComponent isKindOf:ScrollBar) ifTrue:[
+^ aComponent orientation == #vertical
+].
+(aComponent isKindOf:Scroller) ifTrue:[
+^ aComponent orientation == #vertical
+].
+(aComponent isKindOf:Slider) ifTrue:[
+^ aComponent orientation == #vertical
+].
+^ true
+!
 layoutType:aView
 "returns layout type of aView or nil
 "
 |layout spec superView|
 addObjectWithoutRedraw:anObject
 "add the argument, anObject to the contents - with redraw
 "
 self halt
+!
+startCreate:aPoint
+self setDefaultActions.
+self halt
 ! !
 !UIObjectView methodsFor:'event handling'!
 elementChangedSize:aView
 !
 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.
+resizeData isNil ifTrue:[
+super exposeX:x y:y width:w height:h.
-"
-catch expose events for all subviews associated with
+"/ handle any expose events (for subcomponents) before
-a selected instance
+"/ redrawing the handles.
-"
+(self sensor hasExposeEventFor:nil) ifTrue:[^ self].
-"/ handle any expose events (for subcomponents) before
+self selectionDo:[:aComponent |
-"/ redrawing the handles.
+aComponent withAllSubViewsDo:[:v |
-(self sensor hasExposeEventFor:nil) ifTrue:[^ self].
+self sensor flushExposeEventsFor:v.
+v exposeX:0 y:0 width:9999 height:9999.
-self selectionDo:[:aComponent |
+].
-aComponent withAllSubViewsDo:[:v |
-self sensor flushExposeEventsFor:v.
+self showSelected:aComponent
-v exposeX:0 y:0 width:9999 height:9999.
+]
-].
-self showSelected:aComponent
 ]
 !
 keyPress:key x:x y:y
 super cursor:aCursor
 !
-invertOutlineOf:anObject
+invertOutlineOf:something
-"invert outline of an object
+"invert outline of an object or collection of objects
 "
-|wasClipped delta|
+|wasClipped p|
 (wasClipped := clipChildren) ifTrue:[
 self clippedByChildren:(clipChildren := false).
 ].
-delta := (anObject originRelativeTo:self) - anObject origin.
+something isCollection ifTrue:[
-self xoring:[
+something do:[:v|
-self displayRectangle:((anObject origin + delta) extent:anObject extent).
+p := v originRelativeTo:self.
+self xoring:[self displayRectangle:(p extent:v extent)].
+]
+] ifFalse:[
+p := something originRelativeTo:self.
+self xoring:[self displayRectangle:(p extent:something extent)]
 ].
 wasClipped ifTrue:[
 self clippedByChildren:(clipChildren := true).
 ].
-"Modified: 5.9.1995 / 12:25:25 / claus"
 !
 minSetOfSuperViews:setOfViews
 self cursor:Cursor normal.
 ! !
-!UIObjectView methodsFor:'object creation'!
-actionCreate:anObject frame:aFrame delta:aDelta
-"create and initialize action data
-"
-|extent x y selectors values|
-"minimum extent
-"
-(anObject specClass supportsSubComponents) ifTrue:[
-extent := 25@25
-] ifFalse:[
-extent := self extent.
-x := extent x // 3.
-y := extent y // 3.
-extent := anObject preferredExtent.
-(extent x > x) ifTrue:[extent x:x].
-(extent y > y) ifTrue:[extent y:y].
-].
-"setup structure
-"
-selectors := #( object frame delta vertical horizontal minExtent ).
-values    := Array new:(selectors size).
-values at:1 put:anObject.
-values at:2 put:aFrame.
-values at:3 put:aDelta.
-values at:4 put:(self isVerticalResizable:anObject).
-values at:5 put:(self isHorizontalResizable:anObject).
-values at:6 put:extent.
-actionData := Structure newWith:selectors values:values.
-"can change cursor dependent on vertical/horizontal resizing
-"
-oldCursor := cursor.
-self cursor:(Cursor leftHand).
-!
-createWidgetWithClass:aClass
-"prepare to create new widgets
-"
-aClass notNil ifTrue:[
-createClass := aClass.
-pressAction := [:aPoint| self startCreate:aPoint].
-self cursor:Cursor origin.
-]
-!
-doDragCreate:aPoint
-"do a widget create drag
-"
-|frame object extent minimum|
-frame   := actionData frame.
-frame corner:((self alignToGrid:aPoint) - (actionData delta)).
-object  := actionData object.
-minimum := actionData minExtent.
-extent  := frame extent.
-((extent x < minimum x) or:[actionData horizontal not]) ifTrue:[
-extent x:(minimum x)
-].
-((extent y < minimum y) or:[actionData vertical not]) ifTrue:[
-extent y:(minimum y)
-].
-frame extent:extent.
-self invertOutlineOf:object.
-object origin:(frame origin) extent:(frame extent).
-self invertOutlineOf:object.
-!
-endCreate
-"end a widget create drag
-"
-|object specClass|
-object := actionData object.
-self invertOutlineOf:object.
-inputView raise.
-self setupInitialLayoutFor:object.
-self select:object.
-actionData := nil.
-self setDefaultActions.
-!
-initializeCreatedObject:anObject
-self subclassResponsibility
-!
-setupInitialLayoutFor:anObject
-"setup initial layout for an object; !!!! some kludge !!!!
-"
-|spec topSpec|
-topSpec := anObject superView specClass basicNew.
-topSpec class isLayoutContainer ifFalse:[
-"/ ... KLUDGE ....
-spec := anObject specClass.
-(    spec == ViewSpec
-or:[spec == SubCanvasSpec
-or:[spec == TextEditorSpec
-or:[spec == SequenceViewSpec]]]
-) ifTrue:[
-anObject geometryLayout:(anObject bounds asLayout).
-^ self
-]
-].
-topSpec setupInitialLayoutFor:anObject.
-!
-startCreate:aPoint
-"start a widget create
-"
-|widget object start frame delta|
-self select:nil.
-widget := self findContainerViewAt:aPoint.
-motionAction  := [:movePoint| self doDragCreate:movePoint].
-releaseAction := [ self endCreate].
-object := createClass new.
-(widget isKindOf:ScrollableView) ifTrue:[
-widget scrolledView:object
-] ifFalse:[
-widget addSubView:object.
-].
-start := self alignToGrid:aPoint.
-delta := widget originRelativeTo:self.
-frame := Rectangle origin:(start - delta) corner:start.
-object origin:(frame origin).
-self initializeCreatedObject:object.
-self actionCreate:object frame:frame delta:delta.
-object extent:(actionData minExtent).
-object realize.
-self invertOutlineOf:object.
-! !
 !UIObjectView methodsFor:'object moving'!
 doObjectMove:aPoint
 "move selection
 "
 movedObject notNil ifTrue:[
-movedObject keysAndValuesDo:[:nr :aView|
+self invertOutlineOf:movedObject.
-self invertOutlineOf:aView.
-self moveObject:aView to:(aPoint - (moveDelta at:nr)).
+movedObject keysAndValuesDo:[:i :v|
-self invertOutlineOf:aView.
+self moveObject:v to:(aPoint - (moveDelta at:i)).
-]
+].
+self invertOutlineOf:movedObject.
 ]
 !
 endObjectMove
 "cleanup after object(s) move
 "
 movedObject notNil ifTrue:[
-movedObject do:[:aView|self invertOutlineOf:aView].
+self invertOutlineOf:movedObject.
 movedObject size == 1 ifTrue:[
 movedObject := movedObject first
 ].
 self setSelection:movedObject withRedraw:true.
 movedObject := nil.
 self setDefaultActions.
 self changed:#layout.
 ].
 self setSelection:nil withRedraw:true.
 moveDelta := movedObject collect:[:aView|
 aPoint - aView computeOrigin
 ].
+self transaction:#move objects:movedObject do:[:v|self createUndoLayout:v].
-self transaction:#move objects:movedObject do:[:aView|
+self invertOutlineOf:movedObject.
-self invertOutlineOf:aView.
-self createUndoLayout:aView
-].
 !
 startSelectMoreOrMove:aPoint
 "add/remove to/from selection"
 |selector delta|
 delta    := anObject container originRelativeTo:self.
 selector := ('resize:', aSelector, ':') asSymbol.
-actionData := Structure with:(#object->anObject)
+resizeData := Structure with:(#object->anObject)
 with:(#selector->selector)
 with:(#delta->delta).
 "can change cursor dependent on vertical/horizontal resizing
 "
 doDragResize:aPoint
 "do a widget resize drag
 "
 |p object|
-object := actionData object.
+object := resizeData object.
 self invertOutlineOf:object.
-p := (self alignToGrid:aPoint) - (actionData delta).
+p := (self alignToGrid:aPoint) - (resizeData delta).
-self perform:(actionData selector) with:object with:p.
+self perform:(resizeData selector) with:object with:p.
 "/ object geometryLayout:(object geometryLayout).
 self invertOutlineOf:object
 !
 endResize
 "cleanup after object resize
 "
 |object|
-object := actionData object.
+object := resizeData object.
-actionData := nil.
+resizeData := nil.
 self invertOutlineOf:object.
 self setDefaultActions.
 self elementChangedSize:object.
 self invertOutlineOf:object
 ! !
 !UIObjectView methodsFor:'private handles'!
-handlesOf:aView do:aBlock
+handlesOf:aComponent do:aTwoArgAction
-|dlta type v h|
+"perform action on each handle of a component
+"
-dlta := (aView originRelativeTo:self) - aView origin.
+|dlt ext|
-type := self class layoutType:aView.
+dlt := (aComponent originRelativeTo:self) - aComponent origin.
-(type == #LayoutFrame or:[type == #Rectangle]) ifTrue:[
+dlt := dlt - (3@3).
-v := self isVerticalResizable:aView.
+ext := 6@6.
-h := self isHorizontalResizable:aView.
+self class handlesOf:aComponent do:[:pnt :wht |
-h ifTrue:[  aBlock value:(aView leftCenter   + dlta) value:#left.
+aTwoArgAction value:(pnt + dlt extent:ext) value:wht
-aBlock value:(aView rightCenter  + dlta) value:#right.
+]
-].
-v ifTrue:[  aBlock value:(aView topCenter    + dlta) value:#top.
-aBlock value:(aView bottomCenter + dlta) value:#bottom.
-].
-(h and:[v]) ifTrue:[
-aBlock value:(aView origin     + dlta) value:#origin.
-aBlock value:(aView topRight   + dlta) value:#topRight.
-aBlock value:(aView bottomLeft + dlta) value:#bottomLeft.
-aBlock value:(aView corner     + dlta) value:#corner.
-^ self
-]
-].
-aBlock value:(aView origin     + dlta) value:#view.
-aBlock value:(aView topRight   + dlta) value:#view.
-aBlock value:(aView bottomLeft + dlta) value:#view.
-type == #Extent ifTrue:[
-v := self isVerticalResizable:aView.
-h := self isHorizontalResizable:aView.
-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|
+|wasClipped|
+selectionHiddenLevel == 0 ifTrue:[
+self paint:Color black.
+(wasClipped := clipChildren) ifTrue:[
+self clippedByChildren:(clipChildren := false).
+].
+self handlesOf:aComponent do:[:rectangle :what|
+what == #view ifTrue:[self displayRectangle:rectangle]
+ifFalse:[self fillRectangle:rectangle]
+].
+wasClipped ifTrue:[
+self clippedByChildren:(clipChildren := true).
+]
+]
+!
+showUnselected:aComponent
+"show object unselected
+"
+|wasClipped delta r|
 selectionHiddenLevel ~~ 0 ifTrue:[^ self].
-self paint:Color black.
 (wasClipped := clipChildren) ifTrue:[
 self clippedByChildren:(clipChildren := false).
 ].
-self handlesOf:aComponent do:[:pnt :what |
+self handlesOf:aComponent do:[:rec :wht| self clearRectangle:rec ].
-what == #view ifTrue:[self displayRectangle:(pnt - (4@4) extent:7@7)]
-ifFalse:[self    fillRectangle:(pnt - (4@4) extent:7@7)]
-].
-wasClipped ifTrue:[
-self clippedByChildren:(clipChildren := true).
-].
-!
-showUnselected:aComponent
-"show object unselected
-"
-|wasClipped delta r|
-selectionHiddenLevel ~~ 0 ifTrue:[^ self].
-(wasClipped := clipChildren) ifTrue:[
-self clippedByChildren:(clipChildren := false).
-].
-self handlesOf:aComponent do:[:pnt :what |
-self clearRectangle:(pnt - (4@4) extent:7@7).
-].
 wasClipped ifTrue:[
 self clippedByChildren:(clipChildren := true).
 ].
 "/ must redraw all components which are affected b the handles
-r := (aComponent originRelativeTo:self) - (4@4)
+r := (aComponent originRelativeTo:self) - (3@3) extent:(aComponent extent + (6@6)).
-extent:(aComponent extent + (4@4)).
 subViews do:[:anotherComponent |
 |absOrg absFrame|
 anotherComponent ~~ inputView ifTrue:[
 ]
 "Modified: 8.4.1997 / 00:32:26 / cg"
 !
-whichHandleOf:aView isHitBy:aPoint
+whichHandleOf:aComponent isHitBy:aPoint
 "returns kind of handle or nil
 "
-|bounds|
+self handlesOf:aComponent do:[:rectangle :what|
+(rectangle containsPoint:aPoint) ifTrue:[^ what]
-self handlesOf:aView do:[:pnt :what |
+].
-((pnt - (4@4) extent:7@7) containsPoint:aPoint) ifTrue:[
+^ nil
-^ what
-].
-].
-^ nil
-"Modified: 5.9.1995 / 14:39:34 / claus"
 ! !
 !UIObjectView methodsFor:'private resizing-subviews'!
 resize:aView bottom:aPoint
 ^ listOfViews last
 ].
 ^ nil
-!
-isPoint:aPoint containedIn:aView
-"checks whether a point is covered by a view.
-"
-|p|
-p := device translatePoint:aPoint from:inputView id to:aView id.
-(p x >= 0 and:[p y >= 0]) ifTrue:[
-p := aView extent - p.
-(p x >= 0 and:[p y >= 0]) ifTrue:[
-^ true
-]
-].
-^ false
-!
-whichBorderOf:aView isHitBy:aPoint
-|p r bw org|
-bw := aView borderWidth.
-p := aPoint - (aView superView originRelativeTo:self).
-r := Rectangle origin:(aView origin)
-extent:(aView width @ bw).
-(r containsPoint:p) ifTrue:[^ #top:].
-r origin:(aView left @ (aView bottom + bw)) extent:(aView width @ bw).
-(r containsPoint:p) ifTrue:[^ #bottom:].
-r top:(aView top).
-r extent:(bw @ aView height).
-(r containsPoint:p) ifTrue:[^ #left:].
-r origin:((aView right + bw) @ aView top).
-(r containsPoint:p) ifTrue:[^ #right:].
-^ nil
 ! !
 !UIObjectView methodsFor:'selections'!
 moveableSelection
 "
 ^ self numberOfSelections ~~ 0
 !
-isHorizontalResizable:aComponent
-"returns true if instance is horizontal resizeable
-"
-^ self subclassResponsibility
-!
 isModified
 "returns true if painter is modified
 "
 ^ undoHistory isModified
 !
 "
 anObject notNil ifTrue:[
 self selectionDo:[:el| el == anObject ifTrue:[^ true]]
 ].
 ^ false
-!
-isVerticalResizable:aComponent
-"returns true if instance is vertical resizeable
-"
-^ self subclassResponsibility
-!
-supportsLabel:aComponent
-"returns true if component supports label
-"
-^ self subclassResponsibility
 ! !
 !UIObjectView methodsFor:'transaction'!

changeset 175	0b0b4d99e3e7
parent 156	b332d7117c40
child 194	2b05bd327785