hg/stx-libtool2: comparison UIObjectView.st

equal deleted inserted replaced

-:3e2feb544801
+:43386f544f3d
 |type v h|
 type := self layoutType:aView.
 (type == #LayoutFrame or:[type == #Rectangle]) ifTrue:[
-	v := self isVerticalResizable:aView.
+v := self isVerticalResizable:aView.
-	h := self isHorizontalResizable:aView.
+h := self isHorizontalResizable:aView.
-	h ifTrue:[  aBlock value:(aView leftCenter ) value:#left.
+h ifTrue:[
-		    aBlock value:(aView rightCenter) value:#right.
+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.
+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.
+(h and:[v]) ifTrue:[
-	    aBlock value:(aView bottomLeft) value:#bottomLeft.
+aBlock value:(aView origin    ) value:#origin.
-	    aBlock value:(aView corner    ) value:#corner.
+aBlock value:(aView topRight  ) value:#topRight.
-	  ^ self
+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.
+v := self isVerticalResizable:aView.
-	h := self isHorizontalResizable:aView.
+h := self isHorizontalResizable:aView.
-	v ifTrue:[aBlock value:(aView bottomCenter) value:#bottom].
+v ifTrue:[ aBlock value:(aView bottomCenter) value:#bottom ].
-	h ifTrue:[aBlock value:(aView rightCenter ) value:#right ].
+h ifTrue:[ aBlock value:(aView rightCenter ) value:#right ].
-	(h and:[v]) ifTrue:[
+(h and:[v]) ifTrue:[
-	    aBlock value:(aView corner) value:#corner.
+aBlock value:(aView corner) value:#corner.
-	  ^ self
+^ self
-	]
+]
 ].
 aBlock value:(aView corner) value:#view.
 ! !
 !UIObjectView class methodsFor:'queries'!
 isHorizontalResizable:aComponent
 doublePressed:pressPoint
 !
 elementChangedSize:aView
-"some element has changed its size; collect them during selectionHiddenLevel
+"some element has changed its size; collect them while selectionHiddenLevel is on"
-is on
-"
 |spv|
 spv := self findContainerOfView:aView.
-selectionHiddenLevel ~~ 0 ifTrue:[setOfSuperViewsSizeChanged add:spv]
+aView isView ifFalse:[
-			     ifFalse:[spv sizeChanged:nil]
+spv invalidate.
+].
+spv := self findContainerOfView:aView.
+selectionHiddenLevel ~~ 0 ifTrue:[
+setOfSuperViewsSizeChanged add:spv
+] ifFalse:[
+spv sizeChanged:nil
+]
 !
 exposeX:x y:y width:w height:h
 "handle an expose event from device; redraw selection
 "
-resizeData isNil ifTrue:[
+"/    resizeData isNil ifTrue:[
 super exposeX:x y:y width:w height:h.
 "/ handle any expose events (for subcomponents) before
 "/ redrawing the handles.
 "/        (self sensor hasExposeEventFor:nil) ifTrue:[^ self].
 "/                    v exposeX:0 y:0 width:v width height:v height.
 "/                ]
 "/            ].
 "/            self showSelected:aComponent
 "/        ]
-].
+"/    ].
 "Modified: / 9.11.1998 / 12:50:34 / cg"
 !
 keyPress:key x:x y:y
 processEvent:anEvent
 "catch expose events for components, and redraw its handles after
 the redraw when this happens.
 Return true, if I have eaten the event"
-|evView p|
+|evView widget p|
 self testMode ifTrue:[^ false].
+anEvent isInputEvent ifFalse:[^ false].
+anEvent isPointerEnterLeaveEvent ifTrue:[^ true. ^ false].
+anEvent isKeyboardFocusEvent ifTrue:[^ true. ^ false].
 evView := anEvent view.
-(evView isNil or:[evView == self]) ifTrue:[
+evView isNil ifTrue:[
 ^ false
 ].
+(evView == self) ifTrue:[
-(evView isComponentOf:self) ifFalse:[
+"/ new: check for a component to be hit by the event
+components notEmptyOrNil ifTrue:[
+p := (anEvent x @ anEvent y).
+widget := components detect:[:c | c bounds containsPoint:p ] ifNone:nil.
+].
+widget isNil ifTrue:[
+^ false
+].
+] ifFalse:[
+widget := evView.
+].
+(widget isComponentOf:self) ifFalse:[
 ^ false
 ].
-anEvent isInputEvent ifFalse:[
-"/ #isDamage: handled in PostEventHandler
-"/        (shown and:[anEvent isDamage]) ifTrue:[
-"/            (self isSelected:evView) ifTrue:[
-"/                self showSelected:evView
-"/            ].
-"/        ].
-^ false
-].
 (anEvent isButtonEvent or:[anEvent isKeyEvent])  ifFalse:[
 ^ true
 ].
 anEvent isButtonMotionEvent ifTrue:[
 "/ use current point - layout of underlaying view might change
 "/ and computation dependent on origin is wrong
 p := self sensor mousePoint.
 p := device translatePoint:p fromView:nil toView:self.
 ] ifFalse:[
-p := Point x:(anEvent x) y:(anEvent y).
+p := (anEvent x) @ (anEvent y).
 p := device translatePoint:p fromView:evView toView:self.
 ].
 "/ patch the event
 anEvent x:p x.
 redrawX:nx y:ny width:nw height:nh
 |redrawFrame|
 redrawFrame := Rectangle left:nx top:ny width:nw height:nh.
-self clearRectangle:redrawFrame.
+"/ self clearRectangle:redrawFrame.
+super redrawX:nx y:ny width:nw height:nh.
 self selectionDo:[:aComponent |
 |anyHandleToRedraw|
 anyHandleToRedraw := false.
 ! !
 !UIObjectView methodsFor:'misc'!
 invertOutlineOf:something
-"invert outline of an object or collection of objects
+"invert outline of an object or collection of objects"
-"
 |wasClipped|
+^ self.
 (wasClipped := clipChildren) ifTrue:[
 self clippedByChildren:(clipChildren := false).
 ].
 self xoring:[
 |p|
 something isCollection ifTrue:[
 something do:[:v |
-|p|
 p := v originRelativeTo:self.
 self displayRectangle:(p extent:v extent).
 ].
 ] ifFalse:[
-|p|
 p := something originRelativeTo:self.
 self displayRectangle:(p extent:something extent).
 ]
 ].
 (setOfViews contains:[:v | aView isComponentOf:v]) not
 ]
 !
 redrawObjectsInVisible:redrawFrame
-"my objects are views - they redraw themself"
+"my objects are views - they redraw themself.
+- no longer - all non-views MUST be redrawn."
+super redrawObjectsInVisible:redrawFrame.
 ^ self
 !
 setDefaultActions
 "set default actions
 "
 ! !
 !UIObjectView methodsFor:'object moving'!
 doObjectMove:aPoint
-"move selection
+"move selection"
-"
 movedObject notNil ifTrue:[
-	self invertOutlineOf:movedObject.
+self hideSelection.
+self repairDamage.
-	movedObject keysAndValuesDo:[:i :v|
-	    self moveObject:v to:(aPoint - (moveDelta at:i)).
+self invertOutlineOf:movedObject.
-	].
-	self invertOutlineOf:movedObject.
+movedObject keysAndValuesDo:[:i :v|
-]
+self moveObject:v to:(aPoint - (moveDelta at:i)).
+].
+self invertOutlineOf:movedObject.
+self showSelection.
+self repairDamage.
+]
 !
 endObjectMove
 "cleanup after object(s) move
 send expose to each view - workaround....
 movedObject := nil.
 self withSelectionHiddenDo:[
 self setSelection:newSel withRedraw:false.
+components notEmptyOrNil ifTrue:[
+self invalidate.
+].
 self allSubViewsDo:[:v|
 v shown ifTrue:[
 v fill:v viewBackground.
 v exposeX:0 y:0 width:v width height:v height.
 ].
 ]
 ]
 !
 startObjectMoveAt:aPoint
-"start object(s) move at a point
+"start object(s) move at a point"
-"
 self startObjectMove:(self selection) at:aPoint.
 movedObject := self selection.
 movedObject isCollection ifFalse:[
 movedObject := Array with:movedObject
 ].
-self setSelection:nil withRedraw:true.
+"/    self setSelection:nil withRedraw:true.
-moveDelta := movedObject collect:[:aView|
+moveDelta := movedObject collect:[:aView | aPoint - aView computeOrigin].
-aPoint - aView computeOrigin
-].
 self transaction:#move objects:movedObject do:[:v|self createUndoLayout:v].
 self invertOutlineOf:movedObject.
 !
 startSelectMoreOrMove:aPoint
 startSelectOrMove:aPoint
 "a button is pressed at a point; start moving or selecting"
 |selectedView containerOfSelectedView
-clickedView viewOperatedUpon b pView|
+clickedView viewOperatedUpon borderHandleSelector pView|
 self enabled ifFalse:[^ self].
 selectedView := self singleSelection.
 "/    and:[clickedView isComponentOf:selectedView]) ifTrue:[
 "/        self unselect.
 "/        selectedView := nil.
 "/    ].
+"/ if there is already a selection, see if user clicked onto a handle
+"/ then, this may be the start of a resize operation.
 selectedView notNil ifTrue:[
 containerOfSelectedView := self findContainerOfView:selectedView.
 containerOfSelectedView specClass canResizeSubComponents ifTrue:[
-b := self whichHandleOf:selectedView isHitBy:aPoint.
+borderHandleSelector := self whichHandleOf:selectedView isHitBy:aPoint.
-(b notNil and:[b ~~ #view]) ifTrue:[
+(borderHandleSelector notNil and:[borderHandleSelector ~~ #view]) ifTrue:[
-self startResizeBorder:b of:selectedView.
+self startResizeBorder:borderHandleSelector.
 ^ self
 ]
 ].
 viewOperatedUpon := selectedView.
 "
 |p object|
 object := resizeData object.
+self hideSelection.
+self repairDamage.
 self invertOutlineOf:object.
 p := (self alignToGrid:aPoint) - (resizeData delta).
 self perform:(resizeData selector) with:object with:p.
 Delay waitForSeconds:0.05.
 [self sensor hasExposeEventFor:nil] whileTrue:[
 self windowGroup processExposeEvents
 ].
 "/ object geometryLayout:(object geometryLayout).
-self invertOutlineOf:object
+self invertOutlineOf:object.
+self showSelection.
+self repairDamage.
 !
 endResize
 "cleanup after object resize
 "
 !
 layoutChanged
 !
-startResizeBorder:b of:selection
+startResizeBorder:borderHandleSelector
-"resize selected view
+"start resizing the selected view at the given borderHandle"
-"
 |object|
 object := self singleSelection.
-self actionResize:object selector:b.
+self actionResize:object selector:borderHandleSelector.
-self transaction:#resize selectionDo:[:aView|
+self
-self createUndoLayout:aView
+transaction:#resize
-].
+selectionDo:[:aView|
-self setSelection:nil withRedraw:true.
+self createUndoLayout:aView
+].
+"/ self setSelection:nil withRedraw:true.
 motionAction  := [:movePoint | self doDragResize:movePoint].
 releaseAction := [self endResize].
 self invertOutlineOf:object
 ! !
 !UIObjectView methodsFor:'private'!
 aTwoArgAction value:(pnt + dlt extent:ext) value:wht
 ]
 !
 whichHandleOf:aComponent isHitBy:aPoint
-"returns kind of handle or nil
+"returns kind of handle or nil"
-"
 self handlesOf:aComponent do:[:rectangle :what|
-	(rectangle containsPoint:aPoint) ifTrue:[^ what]
+(rectangle containsPoint:aPoint) ifTrue:[^ what]
 ].
 ^ nil
 ! !
 !UIObjectView methodsFor:'private-resizing subviews'!
 recomputeShapeIfTransparentBox:aView
 resize:aView top:aPoint
 "resize a views top"
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y)) bottom:0
+self shiftLayout:aView
+top:((aPoint y) - (aView computeOrigin y))
+bottom:0
 ]
 !
 resize:aView topRight:aPoint
 "resize a views top and right"
 undoHistory withoutTransactionDo:[
-self shiftLayout:aView top:((aPoint y) - (aView computeOrigin y))
+self shiftLayout:aView
-bottom:0
+top:((aPoint y) - (aView computeOrigin y))
-left:0
+bottom:0
-right:((aPoint x) - (aView computeCorner x))
+left:0
+right:((aPoint x) - (aView computeCorner x))
 ]
 ! !
 !UIObjectView methodsFor:'private-shift layout'!
 ! !
 !UIObjectView methodsFor:'searching'!
 findObjectAt:aPoint
-|view viewId lastId point|
+|view viewId lastId point component componentOrView|
-point  := aPoint + (device translatePoint:0@0 fromView:self toView:rootView).
+componentOrView := self findObjectAt:aPoint in:self.
-viewId := rootView id.
+componentOrView == self ifTrue:[^ nil].
-[viewId notNil] whileTrue:[
+^ componentOrView.
-lastId := viewId.
-viewId := device viewIdFromPoint:point in:lastId
+"/ cg: old code, which I do not understand
-].
+"/    point := device translatePoint:aPoint fromView:self toView:rootView.
-view := device viewFromId:lastId.
-view == self ifTrue:[ ^ nil].
-^ view
-"/    view ~~ inputView ifTrue:[^ view].
 "/
-"/    "/ look for 'hidden' views ...
+"/    viewId := rootView id.
-"/
+"/    [viewId notNil] whileTrue:[
-"/    listOfViews := OrderedCollection new.
+"/        lastId := viewId.
-"/    self allSubViewsDo:[:aView |
+"/        viewId := device viewIdFromPoint:point in:lastId. "/ must be rootView coordinate
-"/        |org|
-"/
-"/        aView ~~ inputView ifTrue:[
-"/            org := device translatePoint:0@0 fromView:aView toView:self.
-"/            ((org extent:aView extent) containsPoint:aPoint) ifTrue:[
-"/                listOfViews add:aView.
-"/            ]
-"/        ]
 "/    ].
 "/
-"/    listOfViews size > 0 ifTrue:[
+"/    view := device viewFromId:lastId.
-"/        ^ listOfViews last
+"/    (view isNil or:[view == self]) ifTrue:[
+"/        "/ used to return nil here;
+"/        "/ now support a mix of views and components...
+"/        components notEmptyOrNil ifTrue:[
+"/            component := components detect:[:c | c bounds containsPoint:aPoint] ifNone:nil.
+"/            ^ component
+"/        ].
+"/        ^ nil
 "/    ].
-"/    ^ nil
+"/    ^ view
-"/
+!
-"/    "Modified: / 10.10.2001 / 14:05:07 / cg"
-"/
+findObjectAt:aPoint in:aView
-"/
+|lastHit lastRelPoint view point|
+"/ reverse search, to find covering ones first.
+aView subViews reverseDo:[:aSubView |
+|innerObject relPoint|
+((aSubView origin extent:aSubView extent) containsPoint:aPoint) ifTrue:[
+relPoint := device translatePoint:aPoint fromView:aView toView:aSubView.
+innerObject := self findObjectAt:relPoint in:aSubView.
+innerObject notNil ifTrue:[ ^ innerObject ].
+lastHit := aSubView.
+lastRelPoint := relPoint.
+]
+].
+view := lastHit ? aView.
+point := lastRelPoint ? aPoint.
+view components notEmptyOrNil ifTrue:[
+view components reverseDo:[:eachComponent |
+(eachComponent frame containsPoint:point) ifTrue:[
+^ eachComponent
+].
+].
+].
+^ view
 ! !
 !UIObjectView methodsFor:'selections'!
 hideSelection
 "hide the selection - undraw hilights - whatever that is
 "
-self showUnselected:selection.
+super hideSelection.
+"/    self showUnselected:selection.
 !
 moveableSelection
 "checks whether the selection is not empty and all selected instances
 can be moved. If true the selection is returned otherwise nil
 !
 showSelection
-"show the selection - draw handles
+"show the selection - draw handles"
-"
 selectionHiddenLevel == 0 ifTrue:[
-	self selectionDo:[:el| self showSelected:el ]
+super showSelection
 ].
 !
 singleSelection
 "checks whether a single element is selected; in this case the element is
 |
 aView isInputOnly ifTrue:[^ self ].
 (aView shown and:[theDamages notEmpty]) ifFalse:[ ^ self ].
+aView components notEmptyOrNil ifTrue:[ self halt ].
 aView subViews notNil ifTrue:[
 aView subViews reverseDo:[:v| self recursiveRepair:theDamages startIn:v ].
 theDamages isEmpty ifTrue:[ ^ self ].
 ].
 selection := sel
 ]
 !
 showUnselected:something
-"show a component ot list of components unselected
+"show a component or list of components unselected"
-"
-|damages oldClipped|
+|damages oldClipped savedSelection|
 (selectionHiddenLevel ~~ 0 or:[something isNil]) ifTrue:[
 ^ self
 ].
 ].
 damages add:aDamage
 ]
 ].
-damages do:[:el| self clearRectangle:el ].
+damages do:[:el| self clearRectangle:el. ].
 (oldClipped := clipChildren) ifFalse:[
 self clippedByChildren:(clipChildren := true)
 ].
 self subViews reverseDo:[:v| self recursiveRepair:damages startIn:v].
 oldClipped ~~ clipChildren ifTrue:[
 self clippedByChildren:(clipChildren := oldClipped).
 ].
-device "sync" flush.
+device flush.
+savedSelection := selection.
+[
+selection := nil.
+damages do:[:el| self invalidate:el ].
+self repairDamage.
+] ensure:[
+selection := savedSelection
+].
 ! !
 !UIObjectView methodsFor:'testing'!
 hasSelection
 setLayout:aLayout
 "change layout for all selected objects
 "
 self transaction:#layout dimensionDo:[:v|
-	v geometryLayout:(aLayout copy)
+v geometryLayout:(aLayout copy)
 ].
 !
 setToDefaultExtent
 "change extent of all selected views to their default extent
 "

changeset 2501	43386f544f3d
parent 2485	59ecb1305177
child 2503	36dce8c654af