LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #282021: scale beam thickness

Browse source
This commit is contained in:
Marc Sabatella 2019-03-24 08:14:52 -06:00
parent 12e799d451
commit d788c38b92
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libmscore/beam.cpp
View file

@ -207,7 +207,7 @@ void Beam::draw(QPainter* painter) const
return;
painter->setBrush(QBrush(curColor()));
painter->setPen(Qt::NoPen);
qreal lw2 = score()->styleP(Sid::beamWidth) * .5 * mag();
qreal lw2 = point(score()->styleS(Sid::beamWidth)) * .5 * mag();
// make beam thickness independent of slant
// (expression can be simplified?)
@ -535,7 +535,7 @@ void Beam::layout()
fragments.append(new BeamFragment);
layout2(crl, st, n);
qreal lw2 = score()->styleP(Sid::beamWidth) * .5 * mag();
qreal lw2 = point(score()->styleS(Sid::beamWidth)) * .5 * mag();
// ChordRest* cr = crl.front();
// Shape& s = cr->segment()->shape(staffIdx());
// QPointF offset = cr->pos() + cr->segment()->pos() + cr->segment()->measure()->pos();
@ -2418,7 +2418,7 @@ void Beam::addSkyline(Skyline& sk)
{
if (beamSegments.empty() || !autoplace() || !visible())
return;
qreal lw2 = score()->styleP(Sid::beamWidth) * .5 * mag();
qreal lw2 = point(score()->styleS(Sid::beamWidth)) * .5 * mag();
const QLineF* bs = beamSegments.front();
double d = (qAbs(bs->y2() - bs->y1())) / (bs->x2() - bs->x1());
if (beamSegments.size() > 1 && d > M_PI/6.0)

2
libmscore/tuplet.cpp
View file

@ -313,7 +313,7 @@ void Tuplet::layout()
qreal beamAdjust = 0.0;
if (cr1->beam() && cr1->beam() == cr2->beam()) {
followBeam = true;
beamAdjust = score()->styleP(Sid::beamWidth) * 0.5 * mag();
beamAdjust = point(score()->styleS(Sid::beamWidth)) * 0.5 * mag();
}
if (_isUp) {