--- a/ObjectView.st Thu Nov 16 17:21:18 2000 +0100
+++ b/ObjectView.st Fri Nov 17 01:44:48 2000 +0100
@@ -625,60 +625,58 @@
"check if line drag is into another view"
rootMotion ifTrue:[
- rootPoint := lastButt.
- "
- get device coordinates
- "
- transformation notNil ifTrue:[
- rootPoint := transformation applyTo:rootPoint.
- ].
- viewId := rootView id.
-
- "
- translate to screen
- "
- offs := device translatePoint:0@0 from:(self id) to:viewId.
- rootPoint := rootPoint + offs.
-
- "search view the drop is in"
-
- [viewId notNil] whileTrue:[
- destinationId := device viewIdFromPoint:rootPoint in:viewId.
- lastViewId := viewId.
- viewId := destinationId
- ].
- destinationView := device viewFromId:lastViewId.
- destinationId := lastViewId.
- inMySelf := (destinationView == self).
- rootMotion := false
+ rootPoint := lastButt.
+ "
+ get device coordinates
+ "
+ transformation notNil ifTrue:[
+ rootPoint := transformation applyTo:rootPoint.
+ ].
+ viewId := rootView id.
+
+ "
+ translate to screen
+ "
+ offs := device translatePoint:0@0 from:(self id) to:viewId.
+ rootPoint := rootPoint + offs.
+
+ "search view the drop is in"
+
+ [viewId notNil] whileTrue:[
+ destinationId := device viewIdFromPoint:rootPoint in:viewId.
+ lastViewId := viewId.
+ viewId := destinationId
+ ].
+ destinationView := device viewFromId:lastViewId.
+ destinationId := lastViewId.
+ inMySelf := (destinationView == self).
+ rootMotion := false
] ifFalse:[
- inMySelf := true
+ inMySelf := true
].
inMySelf ifTrue:[
- "a simple line within myself"
- self lineDragFrom:dragObject origin to:dragObject corner
+ "a simple line within myself"
+ self lineDragFrom:dragObject origin to:dragObject corner
] ifFalse:[
- "into another one"
- destinationView notNil ifTrue:[
- destinationPoint := device translatePoint:rootPoint
- from:(rootView id)
- to:(destinationView id).
- destinationView transformation notNil ifTrue:[
- destinationPoint := destinationView transformation applyInverseTo:destinationPoint
- ].
- "
- move into another smalltalk view
- "
- self lineDragFrom:dragObject origin to:destinationPoint in:destinationView
- ] ifFalse:[
- "
- not one of my views
- "
- self lineDragFrom:dragObject origin
- to:destinationPoint
- inAlienViewId:destinationId
- ]
+ "into another one"
+ destinationView notNil ifTrue:[
+ destinationPoint := device translatePoint:rootPoint from:(rootView id) to:(destinationView id).
+ destinationView transformation notNil ifTrue:[
+ destinationPoint := destinationView transformation applyInverseTo:destinationPoint
+ ].
+ "
+ move into another smalltalk view
+ "
+ self lineDragFrom:dragObject origin to:destinationPoint in:destinationView
+ ] ifFalse:[
+ "
+ not one of my views
+ "
+ self lineDragFrom:dragObject origin
+ to:destinationPoint
+ inAlienViewId:destinationId
+ ]
].
self setDefaultActions.
dragObject := nil
@@ -3229,5 +3227,5 @@
!ObjectView class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.85 2000-09-29 12:21:29 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.86 2000-11-17 00:44:38 cg Exp $'
! !