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

position fingering relative to accidental

Browse source
This commit is contained in:
Marc Sabatella 2015-12-17 17:34:32 -07:00
parent 600306e1ec
commit 0ca9703ee2
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libmscore/layout.cpp
View file

@ -2741,11 +2741,20 @@ void Score::layoutFingering(Fingering* f)
{
if (f == 0)
return;
TextStyleType tst = f->textStyleType();
if (tst != TextStyleType::FINGERING && tst != TextStyleType::RH_GUITAR_FINGERING && tst != TextStyleType::STRING_NUMBER)
return;
Note* note = f->note();
Note* note = f->note();
Accidental* acc = note->accidental();
qreal accX = 0.0;
if (acc)
accX = acc->pos().x();
TextStyleType tst = f->textStyleType();
if (tst != TextStyleType::FINGERING && tst != TextStyleType::RH_GUITAR_FINGERING && tst != TextStyleType::STRING_NUMBER) {
// position relative to accidental if present
f->setUserXoffset(accX);
return;
}
Chord* chord = note->chord();
Staff* staff = chord->staff();
Part* part = staff->part();
@ -2793,7 +2802,8 @@ void Score::layoutFingering(Fingering* f)
}
}
else {
x -= spatium();
// position relative to accidental if present
x += accX - spatium();
}
f->setUserOff(QPointF(x, y));
}