Use flat caps for arpeggio lines

Backport of  musescore#9219

Author: Nick-Mazuk

libmscore/arpeggio.cpp

@@ -109,7 +109,7 @@ void Arpeggio::read(XmlReader& e)
 
 //---------------------------------------------------------
 //   symbolLine
-//    construct a string of symbols aproximating width w
+//    construct a string of symbols approximating width w
 //---------------------------------------------------------
 
 void Arpeggio::symbolLine(SymId end, SymId fill)
@@ -180,25 +180,28 @@ void Arpeggio::layout()
                   qreal _spatium = spatium();
                   qreal x1 = _spatium * .5;
                   qreal w  = symBbox(SymId::arrowheadBlackUp).width();
-                  qreal lw = score()->styleS(Sid::ArpeggioLineWidth).val() * _spatium;
-                  setbbox(QRectF(x1 - w * .5, y1, w, y2 - y1 + lw * .5));
+                  qreal terminalDistance = 0;
+                  if (parent())
+                        terminalDistance = _spatium / 4 - score()->styleP(Sid::ArpeggioLineWidth) / 2;
+                  setbbox(QRectF(x1 - w * .5, y1, w, y2 - y1 + terminalDistance));
                   }
                   break;
 
             case ArpeggioType::DOWN_STRAIGHT: {
                   qreal _spatium = spatium();
                   qreal x1 = _spatium * .5;
                   qreal w  = symBbox(SymId::arrowheadBlackDown).width();
-                  qreal lw = score()->styleS(Sid::ArpeggioLineWidth).val() * _spatium;
-                  setbbox(QRectF(x1 - w * .5, y1 - lw * .5, w, y2 - y1 + lw * .5));
+                  qreal terminalDistance = 0;
+                  if (parent())
+                        terminalDistance = _spatium / 4 - score()->styleP(Sid::ArpeggioLineWidth) / 2;
+                  setbbox(QRectF(x1 - w * .5, y1 - terminalDistance, w, y2 - y1 + terminalDistance));
                   }
                   break;
 
             case ArpeggioType::BRACKET: {
                   qreal _spatium = spatium();
-                  qreal lw = score()->styleS(Sid::ArpeggioLineWidth).val() * _spatium * .5;
                   qreal w  = score()->styleS(Sid::ArpeggioHookLen).val() * _spatium;
-                  setbbox(QRectF(0.0, y1, w, y2-y1).adjusted(-lw, -lw, lw, lw));
+                  setbbox(QRectF(0.0, y1, w, y2 - y1));
                   break;
                   }
             }
@@ -214,14 +217,14 @@ void Arpeggio::draw(QPainter* p) const
             return;
       qreal _spatium = spatium();
 
-      qreal y1 = -_userLen1;
-      qreal y2 = _height + _userLen2;
+      qreal y1 = bbox().top();
+      qreal y2 = bbox().bottom();
 
-      p->setPen(QPen(curColor(),
-         score()->styleS(Sid::ArpeggioLineWidth).val() * _spatium,
-         Qt::SolidLine, Qt::RoundCap));
+      qreal lineWidth = score()->styleP(Sid::ArpeggioLineWidth);
 
+      p->setPen(QPen(curColor(), lineWidth, Qt::SolidLine,Qt::FlatCap));
       p->save();
+
       switch (arpeggioType()) {
             case ArpeggioType::NORMAL:
             case ArpeggioType::UP:
@@ -266,9 +269,9 @@ void Arpeggio::draw(QPainter* p) const
             case ArpeggioType::BRACKET:
                   {
                   qreal w = score()->styleS(Sid::ArpeggioHookLen).val() * _spatium;
-                  p->drawLine(QLineF(0.0, y1, 0.0, y2));
                   p->drawLine(QLineF(0.0, y1, w, y1));
                   p->drawLine(QLineF(0.0, y2, w, y2));
+                  p->drawLine(QLineF(0.0, y1 - lineWidth / 2, 0.0, y2 + lineWidth / 2));
                   }
                   break;
             }