better mm rest layout

musescore · Sep 19, 2013 · 3a23fc9 · 3a23fc9
1 parent 5800ba4
commit 3a23fc9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -579,8 +579,11 @@ void Score::doLayout()
                   }
             }
 
-      for (MeasureBase* m = first(); m; m = m->next())
+      for (MeasureBase* m = first(); m; m = m->next()) {
             m->layout0();
+            if (m->type() == Element::MEASURE)
+                  static_cast<Measure*>(m)->setBreakMMRest(false);
+            }
 
       layoutFlags = 0;
 
@@ -910,8 +913,7 @@ void Score::createMMRests()
             Fraction len;
             while (nm->isEmpty()) {
                   MeasureBase* mb = _showVBox ? nm->next() : nm->nextMeasure();
-                  // if (nm->breakMultiMeasureRest() && n)
-                  if (nm->breakMultiMeasureRest())
+                  if (nm->breakMultiMeasureRest() && n)
                         break;
                   ++n;
                   len += nm->len();

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3383,7 +3383,6 @@ void Measure::layoutStage1()
       {
       setDirty();
 
-      setBreakMMRest(false);
       for (int staffIdx = 0; staffIdx < score()->nstaves(); ++staffIdx) {
             if (score()->styleB(ST_createMultiMeasureRests)) {
                   if ((repeatFlags() & RepeatStart) || (prevMeasure() && (prevMeasure()->repeatFlags() & RepeatEnd)))
@@ -3409,9 +3408,18 @@ void Measure::layoutStage1()
             for (Segment* segment = first(); segment; segment = segment->next()) {
                   Element* e = segment->element(track);
 
-                  if (segment->segmentType() & (Segment::SegClef | Segment::SegKeySig | Segment::SegStartRepeatBarLine | Segment::SegTimeSig)) {
-                        if (e && !e->generated())
+                  if (e && !e->generated()) {
+                        if (segment->segmentType() & (Segment::SegKeySig | Segment::SegStartRepeatBarLine | Segment::SegTimeSig))
                               setBreakMMRest(true);
+                        else if (segment->segmentType() == Segment::SegClef) {
+                              if (segment->tick() == endTick()) {
+                                    Measure* m = nextMeasure();
+                                    if (m)
+                                          m->setBreakMMRest(true);
+                                    }
+                              else
+                                    setBreakMMRest(true);
+                              }
                         }
 
                   if (segment->segmentType() == Segment::SegChordRest)