From 523f66ef258894f75b4a55a2029d2731f089e963 Mon Sep 17 00:00:00 2001 From: ws Date: Tue, 24 May 2016 09:18:48 +0200 Subject: [PATCH] fix for continuous view layout --- libmscore/layout.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp index ffb54870de91..31e7431b2779 100644 --- a/libmscore/layout.cpp +++ b/libmscore/layout.cpp @@ -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; @@ -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); @@ -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