Fix #275356: tremolo bar displays incorrectly

musescore · Aug 18, 2018 · 9694cd9 · 9694cd9
1 parent 652a5b3
commit 9694cd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -437,7 +437,7 @@ static const StyleType styleTypes[] {
       { Sid::textLinePosAbove,          "textLinePosAbove",          Spatium(-3.5) },
       { Sid::textLinePosBelow,          "textLinePosBelow",          Spatium(3.5) },
 
-      { Sid::tremoloBarLineWidth,       "tremoloBarLineWidth",       Spatium(0.1) },
+      { Sid::tremoloBarLineWidth,       "tremoloBarLineWidth",       Spatium(0.12) },
       { Sid::jumpPosAbove,              "jumpPosAbove",              Spatium(-2.0) },
       { Sid::markerPosAbove,            "markerPosAbove",            Spatium(-2.0) },
 

diff --git a/libmscore/tremolobar.cpp b/libmscore/tremolobar.cpp
@@ -65,7 +65,7 @@ void TremoloBar::layout()
       for (auto v : _points)
             polygon << QPointF(v.time * timeFactor, v.pitch * pitchFactor);
 
-      qreal w = _lw.val() * _spatium;
+      qreal w = _lw.val();
       setbbox(polygon.boundingRect().adjusted(-w, -w, w, w));
       }
 
@@ -75,7 +75,7 @@ void TremoloBar::layout()
 
 void TremoloBar::draw(QPainter* painter) const
       {
-      QPen pen(curColor(), _lw.val() * spatium(), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+      QPen pen(curColor(), _lw.val(), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
       painter->setPen(pen);
       painter->drawPolyline(polygon);
       }