Correct dynamic end-of-duration alignment in case of clefs

musescore · Dec 23, 2024 · 872daea · 872daea
1 parent 4648888
commit 872daea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/engraving/rendering/score/measurelayout.cpp b/src/engraving/rendering/score/measurelayout.cpp
@@ -2217,6 +2217,18 @@ void MeasureLayout::layoutTimeTickAnchors(Measure* m, LayoutContext& ctx)
         Fraction relativeTick = segment.rtick() - refCRSeg->rtick();
 
         Segment* nextCRSeg = m->findSegmentR(SegmentType::ChordRest, refCRSeg->rtick() + refCRSeg->ticks());
+        if (!nextCRSeg) {
+            Fraction refEndTick = refCRSeg->tick() + refSegDuration;
+            nextCRSeg = refCRSeg;
+            while (nextCRSeg) {
+                Segment* next = nextCRSeg->next();
+                if (next && next->tick() <= refEndTick) {
+                    nextCRSeg = next;
+                } else {
+                    break;
+                }
+            }
+        }
         double width = nextCRSeg ? nextCRSeg->x() - refCRSeg->x() : refCRSeg->width();
 
         double relativeX = width * (relativeTick.toDouble() / refCRSeg->ticks().toDouble());

diff --git a/vtest/scores/dynamics-11.mscz b/vtest/scores/dynamics-11.mscz