Merge pull request #19558 from miiizen/19488-notehead-offset

factor notehead offset into stem length calculations
musescore · Oct 5, 2023 · 339ab2b · 339ab2b
2 parents 7e1af51 + a1ff998
commit 339ab2b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/engraving/dom/chord.cpp b/src/engraving/dom/chord.cpp
@@ -1420,7 +1420,7 @@ double Chord::calcDefaultStemLength()
         // when the chord's magnitude is < 1, the stem length with mag can find itself below the middle line.
         // in those cases, we have to add the extra amount to it to bring it to a minimum.
         double upValue = m_up ? -1. : 1.;
-        double stemStart = startNote->pos().y();
+        double stemStart = startNote->ldata()->pos().y();
         double stemEndMag = stemStart + (finalStemLength * upValue);
         double topLine = 0.0;
         lineDistance *= _spatium;

diff --git a/src/engraving/rendering/dev/beamtremololayout.cpp b/src/engraving/rendering/dev/beamtremololayout.cpp
@@ -1085,7 +1085,7 @@ double BeamTremoloLayout::chordBeamAnchorY(const ChordRest* cr) const
         return y + chord->pagePos().y();
     }
 
-    return position.y() + (chord->defaultStemLength() * upValue) - beamOffset;
+    return position.y() - note->offset().y() + (chord->defaultStemLength() * upValue) - beamOffset;
 }
 
 PointF BeamTremoloLayout::chordBeamAnchor(const ChordRest* cr, ChordBeamAnchorType anchorType) const

diff --git a/vtest/scores/notehead-offset.mscz b/vtest/scores/notehead-offset.mscz