Merge pull request #10665 from asattely/vertical-displace-articulation

[MU4] Fix staccato and tenuto appearing below notes when they shouldn't
musescore · Mar 11, 2022 · 4b092e4 · 4b092e4
2 parents 3185a02 + 11701a2
commit 4b092e4
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/src/engraving/libmscore/chord.cpp b/src/engraving/libmscore/chord.cpp
@@ -3761,12 +3761,20 @@ void Chord::layoutArticulations()
         bool headSide = bottom == up();
         qreal x = centerX();
         qreal y = 0.0;
-
+        const qreal halfBeamSp = score()->styleS(Sid::beamWidth).val() * score()->spatium() * 0.5;
         if (bottom) {
             if (!headSide && stem()) {
-                y = upPos() + stem()->length();
-                if (beam()) {
-                    y += score()->styleS(Sid::beamWidth).val() * _spatium * .5;
+                auto userLen = stem()->userLength();
+                if (_up) {
+                    y = downPos() - stem()->length() - userLen;
+                    if (beam()) {
+                        y -= halfBeamSp * beam()->mag();
+                    }
+                } else {
+                    y = upPos() + stem()->length() - userLen;
+                    if (beam()) {
+                        y += halfBeamSp * beam()->mag();
+                    }
                 }
                 int line   = lrint((y + 0.5 * _spStaff) / _spStaff);
                 if (line < staffType->lines()) {        // align between staff lines
@@ -3797,9 +3805,17 @@ void Chord::layoutArticulations()
             y -= a->height() * .5;              // center symbol
         } else {
             if (!headSide && stem()) {
-                y = downPos() + stem()->length();
-                if (beam()) {
-                    y -= score()->styleS(Sid::beamWidth).val() * _spatium * .5;
+                auto userLen = stem()->userLength();
+                if (_up) {
+                    y = downPos() - stem()->length() + userLen;
+                    if (beam()) {
+                        y -= halfBeamSp * beam()->mag();
+                    }
+                } else {
+                    y = upPos() + stem()->length() + userLen;
+                    if (beam()) {
+                        y += halfBeamSp * beam()->mag();
+                    }
                 }
                 int line   = lrint((y - 0.5 * _spStaff) / _spStaff);
                 if (line >= 0) {        // align between staff lines