Merge pull request #13427 from asattely/slur-adjustment

[MU4] Missed case on slur-tie adjustment
musescore · Sep 23, 2022 · bd3e1bb · bd3e1bb
2 parents 157564f + e1fc970
commit bd3e1bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/engraving/libmscore/slur.cpp b/src/engraving/libmscore/slur.cpp
@@ -1664,10 +1664,12 @@ SpannerSegment* Slur::layoutSystem(System* system)
                     }
                 }
             }
-            if (!adjustedVertically && ec->notes()[0]->tieFor() && !ec->notes()[0]->tieFor()->isInside()
-                && ec->notes()[0]->tieFor()->up() == up()) {
+            Tie* tieFor = ec->notes()[0]->tieFor();
+            if (!adjustedVertically && tieFor && !tieFor->isInside() && tieFor->up() == up()) {
                 // there is a tie that starts on this chordrest
-                p2.rx() -= horizontalTieClearance;
+                if (std::abs(tieFor->frontSegment()->ups(Grip::START).pos().y() - p2.y()) < tieClearance) {
+                    p2.rx() -= horizontalTieClearance;
+                }
             }
         }
     } else {

diff --git a/vtest/scores/slur-adjust-for-tie.mscz b/vtest/scores/slur-adjust-for-tie.mscz