Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #317747: measure number appears after section break #7569

Merged
merged 1 commit into from Mar 5, 2021
Merged

fix #317747: measure number appears after section break #7569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions libmscore/layout.cpp
View file
Open in desktop
Expand Up @@ -3941,8 +3941,8 @@ System* Score::collectSystem(LayoutContext& lc)
if (!s->enabled())
s->setEnabled(true);
}
// TODO: use findPotentialSectionBreak here to handle breaks on frames correctly?
bool firstSystem = lc.prevMeasure->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
const MeasureBase* pbmb = lc.prevMeasure->findPotentialSectionBreak();
bool firstSystem = pbmb->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
if (curHeader)
m->addSystemHeader(firstSystem);
else
Expand Down Expand Up @@ -4981,7 +4981,7 @@ void Score::doLayoutRange(const Fraction& st, const Fraction& et)
else {
const MeasureBase* mb = lc.nextMeasure->prev();
if (mb)
mb->findPotentialSectionBreak();
mb = mb->findPotentialSectionBreak();
LayoutBreak* sectionBreak = mb->sectionBreakElement();
// TODO: also use mb in else clause here?
// probably not, only actual measures have meaningful numbers
Expand Down