Mercurial Mercurial > hg > stx-libwidg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkin from browser
authorClaus Gittinger <cg@exept.de>
Tue, 28 May 1996 20:06:42 +0200
changeset 701 8079d5ac8637
parent 700 962bcd86ac8b
child 702 a0ca5203e629
checkin from browser
ObjView.st file | annotate | diff | comparison | revisions
ObjectView.st file | annotate | diff | comparison | revisions 
--- a/ObjView.st	Tue May 28 19:57:35 1996 +0200
+++ b/ObjView.st	Tue May 28 20:06:42 1996 +0200
@@ -1680,7 +1680,7 @@
     |oldOrigin oldFrame newFrame 
      objectsIntersectingOldFrame objectsIntersectingNewFrame 
      wasObscured isObscured intersects
-     oldLeft oldTop w h newLeft newTop griddedNewOrigin|
+     oldLeft oldTop w h newLeft newTop griddedNewOrigin clip|
 
     anObject isNil ifTrue:[^ self].
     anObject canBeMoved ifFalse:[^ self].
@@ -1704,57 +1704,60 @@
 
     intersects := oldFrame intersects:newFrame.
     intersects ifFalse:[
-	gridShown ifFalse:[
-	    transformation isNil ifTrue:[
-		(objectsIntersectingOldFrame size == 1) ifTrue:[
-		    (objectsIntersectingNewFrame size == 1) ifTrue:[
-			(oldFrame isContainedIn:self clipRect) ifTrue:[
-			    oldLeft := oldFrame left.
-			    oldTop := oldFrame top.
-			    newLeft := newFrame left.
-			    newTop := newFrame top.
-			    w := oldFrame width.
-			    h := oldFrame height.
-			    ((newLeft < width) and:[newTop < height]) ifTrue:[
-				((newLeft >= 0) and:[newTop >= 0]) ifTrue:[
-				    self catchExpose.
-				    self copyFrom:self x:oldLeft y:oldTop
-						     toX:newLeft y:newTop
-						   width:w height:h.
-				    self waitForExpose
-				]
-			    ].
-			    ((oldLeft < width) and:[oldTop < height]) ifTrue:[
-				((oldLeft >= 0) and:[oldTop >= 0]) ifTrue:[
-				  self clearRectangleX:oldLeft y:oldTop width:w height:h.
+        gridShown ifFalse:[
+            transformation isNil ifTrue:[
+                (objectsIntersectingOldFrame size == 1) ifTrue:[
+                    (objectsIntersectingNewFrame size == 1) ifTrue:[
+                        clip := self clippingRectangleOrNil.
+                        (clip isNil or:[oldFrame isContainedIn:clip]) ifTrue:[
+                            oldLeft := oldFrame left.
+                            oldTop := oldFrame top.
+                            newLeft := newFrame left.
+                            newTop := newFrame top.
+                            w := oldFrame width.
+                            h := oldFrame height.
+                            ((newLeft < width) and:[newTop < height]) ifTrue:[
+                                ((newLeft >= 0) and:[newTop >= 0]) ifTrue:[
+                                    self catchExpose.
+                                    self copyFrom:self x:oldLeft y:oldTop
+                                                     toX:newLeft y:newTop
+                                                   width:w height:h.
+                                    self waitForExpose
+                                ]
+                            ].
+                            ((oldLeft < width) and:[oldTop < height]) ifTrue:[
+                                ((oldLeft >= 0) and:[oldTop >= 0]) ifTrue:[
+                                  self clearRectangleX:oldLeft y:oldTop width:w height:h.
 
 "/                                self fillRectangleX:oldLeft y:oldTop width:w height:h
 "/                                               with:viewBackground
-				]
-			    ].
-			    ^ self
-			]
-		    ]
-		]
-	    ]
-	]
+                                ]
+                            ].
+                            ^ self
+                        ]
+                    ]
+                ]
+            ]
+        ]
     ].
     isObscured := self isObscured:anObject.
     (oldFrame intersects:newFrame) ifTrue:[
-	isObscured ifFalse:[
-	    self redrawObjectsIn:oldFrame.
-	    self show: anObject
-	] ifTrue:[
-	    self redrawObjectsIn:(oldFrame merge:newFrame)
-	]
+        isObscured ifFalse:[
+            self redrawObjectsIn:oldFrame.
+            self show: anObject
+        ] ifTrue:[
+            self redrawObjectsIn:(oldFrame merge:newFrame)
+        ]
     ] ifFalse:[
-	self redrawObjectsIn:oldFrame.
-	isObscured ifFalse:[
-	    self show: anObject
-	] ifTrue:[
-	    self redrawObjectsIn:newFrame
-	]
+        self redrawObjectsIn:oldFrame.
+        isObscured ifFalse:[
+            self show: anObject
+        ] ifTrue:[
+            self redrawObjectsIn:newFrame
+        ]
     ]
+
+    "Modified: 28.5.1996 / 20:06:22 / cg"
 !
 
 objectToBack:anObject
@@ -2808,5 +2811,5 @@
 !ObjectView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ObjView.st,v 1.39 1996-05-28 17:57:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ObjView.st,v 1.40 1996-05-28 18:06:42 cg Exp $'
 ! !
--- a/ObjectView.st	Tue May 28 19:57:35 1996 +0200
+++ b/ObjectView.st	Tue May 28 20:06:42 1996 +0200
@@ -1680,7 +1680,7 @@
     |oldOrigin oldFrame newFrame 
      objectsIntersectingOldFrame objectsIntersectingNewFrame 
      wasObscured isObscured intersects
-     oldLeft oldTop w h newLeft newTop griddedNewOrigin|
+     oldLeft oldTop w h newLeft newTop griddedNewOrigin clip|
 
     anObject isNil ifTrue:[^ self].
     anObject canBeMoved ifFalse:[^ self].
@@ -1704,57 +1704,60 @@
 
     intersects := oldFrame intersects:newFrame.
     intersects ifFalse:[
-	gridShown ifFalse:[
-	    transformation isNil ifTrue:[
-		(objectsIntersectingOldFrame size == 1) ifTrue:[
-		    (objectsIntersectingNewFrame size == 1) ifTrue:[
-			(oldFrame isContainedIn:self clipRect) ifTrue:[
-			    oldLeft := oldFrame left.
-			    oldTop := oldFrame top.
-			    newLeft := newFrame left.
-			    newTop := newFrame top.
-			    w := oldFrame width.
-			    h := oldFrame height.
-			    ((newLeft < width) and:[newTop < height]) ifTrue:[
-				((newLeft >= 0) and:[newTop >= 0]) ifTrue:[
-				    self catchExpose.
-				    self copyFrom:self x:oldLeft y:oldTop
-						     toX:newLeft y:newTop
-						   width:w height:h.
-				    self waitForExpose
-				]
-			    ].
-			    ((oldLeft < width) and:[oldTop < height]) ifTrue:[
-				((oldLeft >= 0) and:[oldTop >= 0]) ifTrue:[
-				  self clearRectangleX:oldLeft y:oldTop width:w height:h.
+        gridShown ifFalse:[
+            transformation isNil ifTrue:[
+                (objectsIntersectingOldFrame size == 1) ifTrue:[
+                    (objectsIntersectingNewFrame size == 1) ifTrue:[
+                        clip := self clippingRectangleOrNil.
+                        (clip isNil or:[oldFrame isContainedIn:clip]) ifTrue:[
+                            oldLeft := oldFrame left.
+                            oldTop := oldFrame top.
+                            newLeft := newFrame left.
+                            newTop := newFrame top.
+                            w := oldFrame width.
+                            h := oldFrame height.
+                            ((newLeft < width) and:[newTop < height]) ifTrue:[
+                                ((newLeft >= 0) and:[newTop >= 0]) ifTrue:[
+                                    self catchExpose.
+                                    self copyFrom:self x:oldLeft y:oldTop
+                                                     toX:newLeft y:newTop
+                                                   width:w height:h.
+                                    self waitForExpose
+                                ]
+                            ].
+                            ((oldLeft < width) and:[oldTop < height]) ifTrue:[
+                                ((oldLeft >= 0) and:[oldTop >= 0]) ifTrue:[
+                                  self clearRectangleX:oldLeft y:oldTop width:w height:h.
 
 "/                                self fillRectangleX:oldLeft y:oldTop width:w height:h
 "/                                               with:viewBackground
-				]
-			    ].
-			    ^ self
-			]
-		    ]
-		]
-	    ]
-	]
+                                ]
+                            ].
+                            ^ self
+                        ]
+                    ]
+                ]
+            ]
+        ]
     ].
     isObscured := self isObscured:anObject.
     (oldFrame intersects:newFrame) ifTrue:[
-	isObscured ifFalse:[
-	    self redrawObjectsIn:oldFrame.
-	    self show: anObject
-	] ifTrue:[
-	    self redrawObjectsIn:(oldFrame merge:newFrame)
-	]
+        isObscured ifFalse:[
+            self redrawObjectsIn:oldFrame.
+            self show: anObject
+        ] ifTrue:[
+            self redrawObjectsIn:(oldFrame merge:newFrame)
+        ]
     ] ifFalse:[
-	self redrawObjectsIn:oldFrame.
-	isObscured ifFalse:[
-	    self show: anObject
-	] ifTrue:[
-	    self redrawObjectsIn:newFrame
-	]
+        self redrawObjectsIn:oldFrame.
+        isObscured ifFalse:[
+            self show: anObject
+        ] ifTrue:[
+            self redrawObjectsIn:newFrame
+        ]
     ]
+
+    "Modified: 28.5.1996 / 20:06:22 / cg"
 !
 
 objectToBack:anObject
@@ -2808,5 +2811,5 @@
 !ObjectView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.39 1996-05-28 17:57:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ObjectView.st,v 1.40 1996-05-28 18:06:42 cg Exp $'
 ! !
hg/stx-libwidg