fix #280677, fix #279643: semantics of disable autoplace on stems et al

This commit is contained in:
Marc Sabatella 2019-01-11 11:24:57 -07:00
parent f0e3818f37
commit bbbe1f68e8
2 changed files with 5 additions and 5 deletions

View file

@ -2412,7 +2412,7 @@ QVariant Beam::propertyDefault(Pid id) const
void Beam::addSkyline(Skyline& sk)
{
if (beamSegments.empty())
if (beamSegments.empty() || !autoplace() || !visible())
return;
qreal lw2 = score()->styleP(Sid::beamWidth) * .5 * mag();
const QLineF* bs = beamSegments.front();

View file

@ -3114,13 +3114,13 @@ QString Chord::accessibleExtraInfo() const
Shape Chord::shape() const
{
Shape shape;
if (_hook)
if (_hook && _hook->autoplace() && _hook->visible())
shape.add(_hook->shape().translated(_hook->pos()));
if (_stem)
if (_stem && _stem->autoplace() && _stem->visible())
shape.add(_stem->shape().translated(_stem->pos()));
if (_stemSlash)
if (_stemSlash && _stemSlash->autoplace() && _stemSlash->visible())
shape.add(_stemSlash->shape().translated(_stemSlash->pos()));
if (_arpeggio)
if (_arpeggio && _arpeggio->autoplace() && _arpeggio->visible())
shape.add(_arpeggio->shape().translated(_arpeggio->pos()));
// if (_tremolo)
// shape.add(_tremolo->shape().translated(_tremolo->pos()));