Fixed a bug in setting scatter/area series brush color

2 files changed, 11 insertions, 9 deletions

diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp
index 5201fe0f..d6a2e067 100644
--- a/src/areachart/qareaseries.cpp
+++ b/src/areachart/qareaseries.cpp
@@ -248,8 +248,11 @@ void QAreaSeries::setBrush(const QBrush &brush)
 {
     Q_D(QAreaSeries);
     if (d->m_brush != brush) {
+        bool emitColorChanged = brush.color() != d->m_brush.color();
         d->m_brush = brush;
         emit d->updated();
+        if (emitColorChanged)
+            emit colorChanged(brush.color());
     }
 }
 
@@ -262,11 +265,10 @@ QBrush QAreaSeries::brush() const
 void QAreaSeries::setColor(const QColor &color)
 {
     QBrush b = brush();
-    if (b.color() != color) {
-        b.setColor(color);
-        setBrush(b);
-        emit colorChanged(color);
-    }
+    if (b == QBrush())
+        b.setStyle(Qt::SolidPattern);
+    b.setColor(color);
+    setBrush(b);
 }
 
 QColor QAreaSeries::color() const
diff --git a/src/scatterchart/qscatterseries.cpp b/src/scatterchart/qscatterseries.cpp
index d19edd6b..2a0386b0 100644
--- a/src/scatterchart/qscatterseries.cpp
+++ b/src/scatterchart/qscatterseries.cpp
@@ -185,10 +185,10 @@ void QScatterSeries::setBrush(const QBrush &brush)
 void QScatterSeries::setColor(const QColor &color)
 {
     QBrush b = brush();
-    if (b.color() != color) {
-        b.setColor(color);
-        setBrush(b);
-    }
+    if (b == QBrush())
+        b.setStyle(Qt::SolidPattern);
+    b.setColor(color);
+    setBrush(b);
 }
 
 QColor QScatterSeries::color() const