fix #74951: hairpin appears to remain selected

musescore · Aug 29, 2015 · 25be38d · 25be38d
1 parent b6d47ce
commit 25be38d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/libmscore/hairpin.cpp b/libmscore/hairpin.cpp
@@ -176,13 +176,14 @@ void HairpinSegment::draw(QPainter* painter) const
             TextLineSegment::draw(painter);
             return;
             }
+
       QColor color;
       if (selected() && !(score() && score()->printing()))
             color = (track() > -1) ? MScore::selectColor[voice()] : MScore::selectColor[0];
-      else if (!visible())
+      else if (!hairpin()->visible())     // || !hairpin()->lineVisible()
             color = Qt::gray;
       else
-            color = hairpin()->curColor();
+            color = hairpin()->lineColor();
       QPen pen(color, point(hairpin()->lineWidth()), hairpin()->lineStyle());
       if (hairpin()->lineStyle() == Qt::CustomDashLine) {
             QVector<qreal> pattern;

diff --git a/libmscore/textline.cpp b/libmscore/textline.cpp
@@ -44,7 +44,7 @@ TextLineSegment::~TextLineSegment()
 
 void TextLineSegment::setSelected(bool f)
       {
-      Element::setSelected(f);
+      SpannerSegment::setSelected(f);
       if (_text) {
             if (spannerSegmentType() == SpannerSegmentType::SINGLE || spannerSegmentType() == SpannerSegmentType::BEGIN) {
                   if (textLine()->_beginText)
@@ -75,16 +75,15 @@ void TextLineSegment::draw(QPainter* painter) const
 
       QPointF pp2(pos2());
 
+      // color for line (text color comes from the text properties)
       QColor color;
-      bool normalColor = false;
       if (selected() && !(score() && score()->printing()))
             color = (track() > -1) ? MScore::selectColor[voice()] : MScore::selectColor[0];
-      else if (!tl->visible())
+      else if (!tl->visible() || !tl->lineVisible())
             color = Qt::gray;
-      else {
-            color = tl->curColor();
-            normalColor = true;
-            }
+      else
+            color = tl->lineColor();
+
       qreal l = 0.0;
       if (_text) {
             SpannerSegmentType st = spannerSegmentType();
@@ -111,9 +110,7 @@ void TextLineSegment::draw(QPainter* painter) const
             }
 
       if (tl->lineVisible() || !score()->printing()) {
-            QPen pen(normalColor ? tl->lineColor() : color, textlineLineWidth, tl->lineStyle());
-            if (!tl->lineVisible())
-                  pen.setColor(Qt::gray);
+            QPen pen(color, textlineLineWidth, tl->lineStyle());
             if (tl->lineStyle() == Qt::CustomDashLine) {
                   bool palette = !(parent() && parent()->parent());     // hack for palette
                   QVector<qreal> pattern;