class: DSVLabelView stx_6_2_2
authorca
Fri, 11 Jan 2013 11:44:40 +0100
changeset 4162 a83bdc0dba68
parent 4161 4722a6575ff0
child 4163 3d9fbb60d952
class: DSVLabelView changed: #redrawX:y:width:height:
DSVLabelView.st
--- a/DSVLabelView.st	Thu Jan 10 16:19:11 2013 +0100
+++ b/DSVLabelView.st	Fri Jan 11 11:44:40 2013 +0100
@@ -296,23 +296,34 @@
     ].
 !
 
-redrawX:x y:y width:wArg height:h
-    |savClip w|
+redrawX:xArg y:y width:wArg height:h
+    |savClip x w |
 
     shown ifFalse:[^ self].
 
+    x := xArg.
     w := wArg.
+
     self redrawColumnsInX:x y:y width:w height:h.
+    columns size == 0 ifTrue:[ ^ self ].
+
+    savClip := clipRect.
 
-"/    (x + w) >= (width-margin) ifTrue:[
-"/        w := (width-margin) - 1 - x.
-"/    ].
-    columns notEmpty ifTrue:[
-        savClip := clipRect.
-        self clippingRectangle:(Rectangle left:x top:margin width:w height:height-margin-margin).
-        self redrawEdgesX:x y:y width:w height:h.
-        self clippingRectangle:savClip.
-    ]
+    dataSet has3Dseparators ifTrue:[ | eoXlastCol |
+        eoXlastCol := self xVisibleOfColNr:( columns size + 1).
+        x >= eoXlastCol ifTrue:[
+            w := w +( x - eoXlastCol ).
+            x := eoXlastCol.
+        ].
+    ].
+    self clippingRectangle:(Rectangle left:x top:margin width:w height:height-margin-margin).
+        
+    xArg > x ifTrue:[
+        self paint:(dataSet backgroundColor).
+        self fillRectangleX:x y:y width:w height:h.
+    ].    
+    self redrawEdgesX:x y:y width:w height:h.
+    self clippingRectangle:savClip.
 ! !
 
 !DSVLabelView methodsFor:'enumerating columns'!
@@ -753,9 +764,10 @@
 !DSVLabelView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.69 2009-10-19 12:20:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.70 2013-01-11 10:44:40 ca Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.69 2009-10-19 12:20:23 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/DSVLabelView.st,v 1.70 2013-01-11 10:44:40 ca Exp $'
 ! !
+