fix #151256, part 1: fix lyrics intersection inside measure

musescore · Jan 10, 2019 · 54eab63 · 54eab63
1 parent f311468
commit 54eab63
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -4000,13 +4000,14 @@ void Measure::computeMinWidth(Segment* s, qreal x, bool isSystemHeader)
                   for (Segment* ps = s; ps != fs;) {
                         qreal ww;
                         ps = ps->prevEnabled();
+
+                        if (ps->isChordRestType())
+                              ++n;
+                        ww = ps->minHorizontalCollidingDistance(ns) - (s->x() - ps->x());
+
                         if (ps == fs)
-                              ww = ns->minLeft(ls) - s->x();
-                        else {
-                              if (ps->isChordRestType())
-                                    ++n;
-                              ww = ps->minHorizontalCollidingDistance(ns) - (s->x() - ps->x());
-                              }
+                              ww = std::max(ww, ns->minLeft(ls) - s->x());
+
                         if (ww > w) {
                               // overlap !
                               // distribute extra space between segments ps - ss;