[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Honour the line width and color correctly.
Don't use the requested line width for bar graphs.


  M +4 -5      kst2dplot.cpp   1.316


--- kdeextragear-2/kst/kst/kst2dplot.cpp  #1.315:1.316
@@ -5347,6 +5347,4 @@ void Kst2DPlot::plotCurves(QPainter& p,
           overlap = false;
         }
-
-        p.setPen(QPen(c->color(), (c->lineWidth() < penWidth ? penWidth : c->lineWidth())));
       } // end if c->hasLines()
 
@@ -5365,4 +5363,6 @@ void Kst2DPlot::plotCurves(QPainter& p,
         if (c->barStyle() == 1) { // filled
           p.setPen(QPen(_foregroundColor));
+        } else {
+          p.setPen(QPen(c->color()));
         }
 
@@ -5462,9 +5462,8 @@ void Kst2DPlot::plotCurves(QPainter& p,
           }
         }
-        if (c->barStyle() == 1) { // filled
-          p.setPen(QPen(c->color()));
-        }
       }
 
+      p.setPen(QPen(c->color(), (c->lineWidth() < penWidth ? penWidth : c->lineWidth())));
+
       //
       // draw the points, if any...