Merge pull request #4687 from MarcSabatella/280865-lyric-rest-y

fix #280865: lyric attached to rest too low
This commit is contained in:
anatoly-os 2019-02-18 20:20:43 +02:00 committed by GitHub
commit bb0b6ab747
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -337,11 +337,11 @@ void Lyrics::layout2(int nAbove)
if (placeBelow()) {
qreal yo = segment()->measure()->system()->staff(staffIdx())->bbox().height();
rypos() = lh * (_no - nAbove) + yo;
rypos() = lh * (_no - nAbove) + yo - chordRest()->y();
rpos() += styleValue(Pid::OFFSET, Sid::lyricsPosBelow).toPointF();
}
else {
rypos() = -lh * (nAbove - _no - 1);
rypos() = -lh * (nAbove - _no - 1) - chordRest()->y();
rpos() += styleValue(Pid::OFFSET, Sid::lyricsPosAbove).toPointF();
}
}