--- a/Scroller.st	Mon May 03 23:33:39 1999 +0200
+++ b/Scroller.st	Tue May 04 19:10:50 1999 +0200
@@ -1175,34 +1175,39 @@
     |oldClip gX gY gW gH|
 
     shown ifTrue:[
-	self clearRectangleX:x y:y width:w height:h.
-	frameBeforeMove notNil ifTrue:[
-	    (frameBeforeMove intersects:(x@y extent:w@h)) ifTrue:[
-		oldClip := self clippingRectangleOrNil.
-		self clippingRectangle:(Rectangle left:x top:y width:w height:h).
+        self clearDeviceRectangleX:x y:y width:w height:h.
+
+        frameBeforeMove notNil ifTrue:[
+            (ghostColor notNil 
+            or:[ghostFrameColor notNil
+            or:[ghostLevel ~~ 0]]) ifTrue:[
+                (frameBeforeMove intersects:(x@y extent:w@h)) ifTrue:[
+                    oldClip := self clippingRectangleOrNil.
+                    self clippingRectangle:(Rectangle left:x top:y width:w height:h).
 
-		gX := frameBeforeMove left.
-		gY := frameBeforeMove top.
-		gW := frameBeforeMove width.
-		gH := frameBeforeMove height.
-            
-		ghostColor notNil ifTrue:[
-		    self paint:ghostColor.
-		    self fillRectangle:frameBeforeMove.
-		].
-		(ghostLevel ~~ 0) ifTrue:[
-		    self drawEdgesForX:gX y:gY width:gW height:gH level:ghostLevel
-		].
-		ghostFrameColor notNil ifTrue:[
-		    self paint:ghostFrameColor.
-		    self displayRectangleX:gX y:gY width:gW height:gH
-		].
-		self clippingRectangle:oldClip
-	    ]
-	]
+                    gX := frameBeforeMove left.
+                    gY := frameBeforeMove top.
+                    gW := frameBeforeMove width.
+                    gH := frameBeforeMove height.
+                
+                    ghostColor notNil ifTrue:[
+                        self paint:ghostColor.
+                        self fillRectangle:frameBeforeMove.
+                    ].
+                    (ghostLevel ~~ 0) ifTrue:[
+                        self drawEdgesForX:gX y:gY width:gW height:gH level:ghostLevel
+                    ].
+                    ghostFrameColor notNil ifTrue:[
+                        self paint:ghostFrameColor.
+                        self displayRectangleX:gX y:gY width:gW height:gH
+                    ].
+                    self clippingRectangle:oldClip
+                ]
+            ]
+        ]
     ]
 
-    "Modified: 28.5.1996 / 19:53:40 / cg"
+    "Modified: / 4.5.1999 / 18:51:53 / cg"
 ! !
 
 !Scroller methodsFor:'event handling'!
@@ -2338,5 +2343,5 @@
 !Scroller class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.128 1999-04-29 08:00:47 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Scroller.st,v 1.129 1999-05-04 17:10:50 cg Exp $'
 ! !