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

fix #114346

Browse source
This commit is contained in:
werner 2016-08-17 17:27:09 +02:00
parent d86f9c1666
commit 5c9d1b638b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libmscore/layout.cpp
View file

@ -3001,8 +3001,7 @@ System* Score::collectSystem(LayoutContext& lc)
return 0; return 0;
} }
bool raggedRight = MScore::noHorizontalStretch; bool raggedRight = MScore::noHorizontalStretch;
System* system = getNextSystem(lc);
System* system = getNextSystem(lc);
system->setInstrumentNames(lc.startWithLongNames); system->setInstrumentNames(lc.startWithLongNames);
qreal xo; qreal xo;
@ -3503,9 +3502,11 @@ System* Score::collectSystem(LayoutContext& lc)
} }
system->layout2(); // compute staff distances system->layout2(); // compute staff distances
Measure* lm = system->lastMeasure(); Measure* lm = system->lastMeasure();
lc.firstSystem = lm && lm->sectionBreak() && _layoutMode != LayoutMode::FLOAT; if (lm) {
lc.startWithLongNames = lc.firstSystem && lm->sectionBreak()->startWithLongNames(); lc.firstSystem = lm->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
lc.startWithLongNames = lc.firstSystem && lm->sectionBreak()->startWithLongNames();
}
lc.systemChanged = lc.systemOldMeasure != (system->measures().empty() ? 0 : system->measures().back()); lc.systemChanged = lc.systemOldMeasure != (system->measures().empty() ? 0 : system->measures().back());
return system; return system;
} }