From 553ffb845c79fa956399fe5c7036bdc6dd3f42ae 2014-03-11 08:31:28
From: Titta Heikkala <titta.heikkala@digia.com>
Date: 2014-03-11 08:31:28
Subject: [PATCH] Fix scatter series color

Setting scatter series border color and color fixed. Setting color
on top of default pen and brush resulted wrong behavior.

Task-number: QTRD-2644
Change-Id: I34c022d2e49d78b80d7e5f347af993442156a57c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

---

diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp
index 584d0b1..62fa1a6 100644
--- a/src/scatterchart/qscatterseries.cpp
+++ b/src/scatterchart/qscatterseries.cpp
@@ -195,6 +195,8 @@ void QScatterSeries::setBrush(const QBrush &brush)
 void QScatterSeries::setColor(const QColor &color)
 {
     QBrush b = brush();
+    if (b == QChartPrivate::defaultBrush())
+        b = QBrush();
     if (b == QBrush())
         b.setStyle(Qt::SolidPattern);
     b.setColor(color);
@@ -209,10 +211,10 @@ QColor QScatterSeries::color() const
 void QScatterSeries::setBorderColor(const QColor &color)
 {
     QPen p = pen();
-    if (p.color() != color) {
-        p.setColor(color);
-        setPen(p);
-    }
+    if (p == QChartPrivate::defaultPen())
+        p = QPen();
+    p.setColor(color);
+    setPen(p);
 }
 
 QColor QScatterSeries::borderColor() const