Skip to content

Commit

Permalink
fix for continuous view layout
Browse files Browse the repository at this point in the history
  • Loading branch information
wschweer committed May 24, 2016
1 parent f0a50b5 commit 523f66e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions libmscore/layout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3204,7 +3204,7 @@ System* Score::collectSystem(LayoutContext& lc)

// stretch incomplete row
qreal rest;
if (MScore::layoutDebug)
if (lineMode || MScore::layoutDebug)
rest = 0;
else {
rest = systemWidth - minWidth;
Expand Down Expand Up @@ -3232,8 +3232,10 @@ System* Score::collectSystem(LayoutContext& lc)
ww = m->width() + rest * m->ticks() * stretch;
m->stretchMeasure(ww);
}
else
else {
m->stretchMeasure(m->width());
ww = m->width();
}
}
else if (mb->isHBox()) {
mb->setPos(pos);
Expand Down Expand Up @@ -3481,8 +3483,7 @@ void Score::doLayout()
;
if (_layoutMode == LayoutMode::LINE) {
Page* page = _pages[0];
System* system = page->system(0);
page->setWidth(system->width());
page->setWidth(page->system(0)->width());
}

// TODO: remove remaining systems from lc.systemList
Expand Down

0 comments on commit 523f66e

Please sign in to comment.