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

fix #42891: lyrics run off bottom of page

Browse source
This commit is contained in:
Marc Sabatella 2015-03-09 15:07:13 -06:00
parent 689fad5a36
commit dfaef4d217
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libmscore/layout.cpp
View file

@ -3357,7 +3357,7 @@ PAGEDBG(" system %d", i);
bmargin = vbox->bottomGap(); bmargin = vbox->bottomGap();
tmargin = vbox->topGap(); tmargin = vbox->topGap();
if (pC.lastSystem) { if (pC.lastSystem) {
if (pC.lastSystem->isVbox()) if (pC.lastSystem->isVbox())
tmargin += pC.lastSystem->vbox()->bottomGap(); tmargin += pC.lastSystem->vbox()->bottomGap();
else else
tmargin += systemFrameDistance; tmargin += systemFrameDistance;
@ -3475,6 +3475,15 @@ void Score::layoutPage(const PageContext& pC, qreal d)
return; return;
} }
// allow room for lyrics on last staff of last system
// these are not included in system height or in previous margin calculations
// but they are accounted for in prevDist
int lastStaffIdx = nstaves() - 1;
if (!pC.lastSystem->isVbox() && staff(lastStaffIdx)->show() && pC.lastSystem->staff(lastStaffIdx)->show()) {
if (pC.prevDist > pC.slb)
restHeight -= pC.prevDist - pC.slb;
}
const qreal maxStretch = styleP(StyleIdx::maxSystemDistance) - styleP(StyleIdx::minSystemDistance); const qreal maxStretch = styleP(StyleIdx::maxSystemDistance) - styleP(StyleIdx::minSystemDistance);
QList<System*> slist; QList<System*> slist;