Merge pull request #2063 from MarcSabatella/64911-start-repeat-space

fix #64911: space before start repeat
musescore · Jun 12, 2015 · 85b0ef0 · 85b0ef0
2 parents eaf2411 + b4bdcdd
commit 85b0ef0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -3929,8 +3929,8 @@ qreal Score::computeMinWidth(Segment* fs, bool firstMeasureInSystem)
                               }
                         if ((segType == Segment::Type::Clef) && (pt != Segment::Type::ChordRest))
                               minDistance = styleP(StyleIdx::clefLeftMargin);
-                        else if (segType == Segment::Type::StartRepeatBarLine)
-                              minDistance = .5 * _spatium;
+                        else if (segType == Segment::Type::StartRepeatBarLine && pSeg)
+                              minDistance = .5 * _spatium;  // TODO: make style parameter
                         else if (segType == Segment::Type::TimeSig && pt == Segment::Type::Clef) {
                               // missing key signature, but allocate default margin anyhow
                               minDistance = styleP(StyleIdx::keysigLeftMargin);
@@ -3974,12 +3974,12 @@ qreal Score::computeMinWidth(Segment* fs, bool firstMeasureInSystem)
                         qreal sp = 0.0;
 
                         // space chord symbols unless they miss each other vertically
-                        if (eFound || (hFound && hBbox.top() < hLastBbox[staffIdx].bottom() && hBbox.bottom() > hLastBbox[staffIdx].top()))
+                        if (hFound && hBbox.top() < hLastBbox[staffIdx].bottom() && hBbox.bottom() > hLastBbox[staffIdx].top())
                               sp = hRest[staffIdx] + minHarmonyDistance + hSpace.lw();
 
                         // barline: limit space to maxHarmonyBarDistance
-                        if (eFound && !hFound && spaceHarmony)
-                              sp = qMin(sp, maxHarmonyBarDistance);
+                        else if (eFound && !hFound && spaceHarmony)
+                              sp = qMin(hRest[staffIdx], maxHarmonyBarDistance);
 
                         hLastBbox[staffIdx] = hBbox;
                         hRest[staffIdx] = hSpace.rw();

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3371,7 +3371,7 @@ void Measure::layoutX(qreal stretch)
                               }
                         if ((segType == Segment::Type::Clef) && (pt != Segment::Type::ChordRest))
                               minDistance = score()->styleS(StyleIdx::clefLeftMargin).val() * _spatium;
-                        else if (segType == Segment::Type::StartRepeatBarLine)
+                        else if (segType == Segment::Type::StartRepeatBarLine && pSeg)
                               minDistance = .5 * _spatium;
                         else if (segType == Segment::Type::TimeSig && pt == Segment::Type::Clef) {
                               // missing key signature, but allocate default margin anyhow
@@ -3417,12 +3417,12 @@ void Measure::layoutX(qreal stretch)
                         qreal sp = 0.0;
 
                         // space chord symbols unless they miss each other vertically
-                        if (eFound || (hFound && hBbox.top() < hLastBbox[staffIdx].bottom() && hBbox.bottom() > hLastBbox[staffIdx].top()))
+                        if (hFound && hBbox.top() < hLastBbox[staffIdx].bottom() && hBbox.bottom() > hLastBbox[staffIdx].top())
                               sp = hRest[staffIdx] + minHarmonyDistance + hSpace.lw();
 
                         // barline: limit space to maxHarmonyBarDistance
-                        if (eFound && !hFound && spaceHarmony)
-                              sp = qMin(sp, maxHarmonyBarDistance);
+                        else if (eFound && spaceHarmony)
+                              sp = qMin(hRest[staffIdx], maxHarmonyBarDistance);
 
                         hLastBbox[staffIdx] = hBbox;
                         hRest[staffIdx] = hSpace.rw();