Fix 308771: (including Color)

Author: elerouxx

libmscore/ledgerline.cpp

@@ -64,7 +64,7 @@ void LedgerLine::layout()
       {
       setLineWidth(score()->styleP(Sid::ledgerLineWidth) * chord()->mag());
       if (staff())
-            setColor(staff()->color());
+            setColor(staff()->staffType(tick())->color()); //or staff()->color(tick()) ?
       qreal w2 = _width * .5;
       if (vertical)
             bbox().setRect(-w2, -w2, _width, _len + _width);

libmscore/staff.cpp

@@ -651,7 +651,7 @@ void Staff::write(XmlWriter& xml) const
             }
 
       if (invisible(Fraction(0,1)))
-            xml.tag("invisible", invisible(Fraction(0,1))); //obsolete?
+            xml.tag("invisible", invisible(Fraction(0,1)));
       if (hideWhenEmpty() != HideMode::AUTO)
             xml.tag("hideWhenEmpty", int(hideWhenEmpty()));
       if (cutaway())
@@ -723,7 +723,7 @@ bool Staff::readProperties(XmlReader& e)
       else if (tag == "small")                  // obsolete
             staffType(Fraction(0,1))->setSmall(e.readInt());
       else if (tag == "invisible")
-            staffType(Fraction(0,1))->setInvisible(e.readInt());          // obsolete?
+            staffType(Fraction(0,1))->setInvisible(e.readInt());          // same as: setInvisible(Fraction(0,1)), e.readInt())
       else if (tag == "hideWhenEmpty")
             setHideWhenEmpty(HideMode(e.readInt()));
       else if (tag == "cutaway")
@@ -775,7 +775,7 @@ bool Staff::readProperties(XmlReader& e)
                   }
             }
       else if (tag == "color")
-            _color = e.readColor();
+            staffType(Fraction(0,1))->setColor(e.readColor());
       else if (tag == "transposeDiatonic")
             e.setTransposeDiatonic(e.readInt());
       else if (tag == "transposeChromatic")
@@ -1177,6 +1177,24 @@ bool Staff::showLedgerLines(const Fraction& tick) const
       return staffType(tick)->showLedgerLines();
       }
 
+//---------------------------------------------------------
+//   color
+//---------------------------------------------------------
+
+QColor Staff::color(const Fraction& tick) const
+      {
+      return staffType(tick)->color();
+      }
+
+//---------------------------------------------------------
+//   setColor
+//---------------------------------------------------------
+
+void Staff::setColor(const Fraction& tick, const QColor& val)
+      {
+      staffType(tick)->setColor(val);
+      }
+
 //---------------------------------------------------------
 //   updateOttava
 //---------------------------------------------------------
@@ -1313,8 +1331,10 @@ QVariant Staff::getProperty(Pid id) const
                   return staffType(Fraction(0,1))->small();
             case Pid::MAG:
                   return staffType(Fraction(0,1))->userMag();
+            case Pid::STAFF_INVISIBLE:
+                  return staffType(Fraction(0,1))->invisible();
             case Pid::COLOR:
-                  return color();
+                  return staffType(Fraction(0,1))->color();
             case Pid::PLAYBACK_VOICE1:
                   return playbackVoice(0);
             case Pid::PLAYBACK_VOICE2:
@@ -1359,7 +1379,7 @@ bool Staff::setProperty(Pid id, const QVariant& v)
                   }
                   break;
             case Pid::COLOR:
-                  setColor(v.value<QColor>());
+                  setColor(Fraction(0,1),v.value<QColor>());
                   break;
             case Pid::PLAYBACK_VOICE1:
                   setPlaybackVoice(0, v.toBool());
@@ -1550,4 +1570,3 @@ void Staff::setInvisible(const Fraction& tick, bool val)
 }
 
 
-

libmscore/staff.h

@@ -167,8 +167,6 @@ class Staff final : public ScoreElement {
 
       bool show() const;
       bool stemless(const Fraction&) const;
-      //bool invisible() const         { return _invisible;   }  //obsolete
-      //void setInvisible(bool val)    { _invisible = val;    } //obsolete
       bool cutaway() const           { return _cutaway;     }
       void setCutaway(bool val)      { _cutaway = val;      }
       bool showIfEmpty() const       { return _showIfEmpty; }
@@ -222,8 +220,8 @@ class Staff final : public ScoreElement {
       void setLines(const Fraction&, int lines);
       qreal lineDistance(const Fraction&) const;
 
-      bool invisible(const Fraction& tick) const;
-      void setInvisible(const Fraction& tick, bool val);
+      bool invisible(const Fraction&) const;
+      void setInvisible(const Fraction&, bool val);
 
       void setSlashStyle(const Fraction&, bool val);
       int middleLine(const Fraction&) const;
@@ -252,9 +250,9 @@ class Staff final : public ScoreElement {
       bool genKeySig();
       bool showLedgerLines(const Fraction&) const;
 
-      QColor color() const                { return _color; }
-      void setColor(const QColor& val)    { _color = val;    }
-      void undoSetColor(const QColor& val);
+      QColor color(const Fraction&) const;
+      void setColor(const Fraction&, const QColor& val);
+      void undoSetColor(const QColor& val);  //disabled?
       void insertTime(const Fraction&, const Fraction& len);
 
       QVariant getProperty(Pid) const override;

libmscore/stafflines.cpp

@@ -94,7 +94,7 @@ void StaffLines::layoutForWidth(qreal w)
       if (s) {
             setMag(s->mag(measure()->tick()));
             setVisible(!s->invisible(measure()->tick()));
-            setColor(s->color());
+            setColor(s->color(measure()->tick()));
             const StaffType* st = s->staffType(measure()->tick());
             dist         *= st->lineDistance().val();
             _lines        = st->lines();