fix #25650

musescore · May 6, 2014 · c20b96e · c20b96e
1 parent 7bc254f
commit c20b96e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/libmscore/line.h b/libmscore/line.h
@@ -111,7 +111,7 @@ class SLine : public Spanner {
       void setDiagonal(bool v)            { _diagonal = v;    }
 
       Spatium lineWidth() const           { return _lineWidth;            }
-      QColor lineColor() const            { return (_lineColor == Qt::black)? curColor() : _lineColor; }
+      QColor lineColor() const            { return _lineColor;            }
       Qt::PenStyle lineStyle() const      { return _lineStyle;            }
       void setLineWidth(const Spatium& v) { _lineWidth = v;               }
       void setLineColor(const QColor& v)  { _lineColor = v;               }

diff --git a/libmscore/text.cpp b/libmscore/text.cpp
@@ -852,11 +852,13 @@ void Text::draw(QPainter* p) const
                   }
             }
       p->setBrush(Qt::NoBrush);
-      QColor color(textStyle().foregroundColor());
-      if (!visible())
-            color = Qt::gray;
-      else if (selected())
+      QColor color;
+      if (selected())
             color = MScore::selectColor[0];
+      else if (!visible())
+            color = Qt::gray;
+      else
+            color = textStyle().foregroundColor();
       p->setPen(color);
       if (_editMode && _cursor.hasSelection()) {
             int r1 = _cursor.selectLine();

diff --git a/libmscore/textline.cpp b/libmscore/textline.cpp
@@ -80,10 +80,10 @@ void TextLineSegment::draw(QPainter* painter) const
       bool normalColor = false;
       if (selected() && !(score() && score()->printing()))
             color = MScore::selectColor[0];
-      else if (!visible())
+      else if (!tl->visible())
             color = Qt::gray;
       else {
-            color = textLine()->curColor();
+            color = tl->curColor();
             normalColor = true;
             }
       qreal l = 0.0;
@@ -97,7 +97,7 @@ void TextLineSegment::draw(QPainter* painter) const
                   l = _text->pos().x() + bb.width() + textlineTextDistance;
                   }
             painter->translate(_text->pos());
-            painter->setPen(normalColor ? _text->curColor() : color);
+            _text->setVisible(tl->visible());
             _text->draw(painter);
             painter->translate(-_text->pos());
             }
@@ -625,6 +625,7 @@ void TextLine::writeProperties(Xml& xml) const
 //---------------------------------------------------------
 //   resolveSymCompatibility
 //---------------------------------------------------------
+
 static QString resolveSymCompatibility(SymId i, QString programVersion)
       {
       if (!programVersion.isEmpty() && programVersion < "1.1")