Merge pull request #1346 from AntonioBL/slur_color

fix #22779 : Slur color change not showing in the score
musescore · Oct 4, 2014 · 599f929 · 599f929
2 parents 4cf2ce1 + b0098ee
commit 599f929
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -1547,7 +1547,7 @@ bool Element::setProperty(P_ID propertyId, const QVariant& v)
                   _generated = v.toBool();
                   break;
             case P_ID::COLOR:
-                  _color = v.value<QColor>();
+                  setColor(v.value<QColor>());
                   break;
             case P_ID::VISIBLE:
                   setVisible(v.toBool());

diff --git a/libmscore/element.h b/libmscore/element.h
@@ -179,6 +179,7 @@ class Element : public QObject {
   protected:
       bool _selected;             ///< set if element is selected
       bool _visible;              ///< visibility attribute
+      QColor _color;              ///< element color attribute
 
   public:
       //-------------------------------------------------------------------
@@ -292,7 +293,6 @@ class Element : public QObject {
       mutable ElementFlags _flags;
 
       int _track;                 ///< staffIdx * VOICES + voice
-      QColor _color;
       qreal _mag;                 ///< standard magnification (derived value)
 
       QPointF _pos;               ///< Reference position, relative to _parent.
@@ -454,7 +454,7 @@ class Element : public QObject {
       QColor color() const             { return _color; }
       QColor curColor() const;
       QColor curColor(const Element* proxy) const;
-      void setColor(const QColor& c)     { _color = c;    }
+      virtual void setColor(const QColor& c)     { _color = c;    }
       void undoSetColor(const QColor& c);
 
       static Element::Type readType(XmlReader& node, QPointF*, Fraction*);

diff --git a/libmscore/spanner.cpp b/libmscore/spanner.cpp
@@ -172,6 +172,21 @@ void SpannerSegment::setVisible(bool f)
             _visible = f;
       }
 
+//---------------------------------------------------------
+//   setColor
+//---------------------------------------------------------
+
+void SpannerSegment::setColor(const QColor& col)
+      {
+      if (_spanner) {
+            for (SpannerSegment* ss : _spanner->spannerSegments())
+                  ss->_color = col;
+            _spanner->_color = col;
+            }
+      else
+            _color = col;
+      }
+
 //---------------------------------------------------------
 //   nextElement
 //---------------------------------------------------------
@@ -545,6 +560,17 @@ void Spanner::setVisible(bool f)
       _visible = f;
       }
 
+//---------------------------------------------------------
+//   setColor
+//---------------------------------------------------------
+
+void Spanner::setColor(const QColor& col)
+      {
+      for (SpannerSegment* ss : spannerSegments())
+            ss->setColor(col);
+      _color = col;
+      }
+
 //---------------------------------------------------------
 //   setStartElement
 //---------------------------------------------------------

diff --git a/libmscore/spanner.h b/libmscore/spanner.h
@@ -77,6 +77,7 @@ class SpannerSegment : public Element {
       virtual void reset() override;
       virtual void setSelected(bool f) override;
       virtual void setVisible(bool f) override;
+      virtual void setColor(const QColor& col) override;
 
       virtual Element* nextElement() override;
       virtual Element* prevElement() override;
@@ -176,6 +177,7 @@ class Spanner : public Element {
 
       virtual void setSelected(bool f) override;
       virtual void setVisible(bool f) override;
+      virtual void setColor(const QColor& col) override;
       virtual Element* nextElement() override;
       virtual Element* prevElement() override;