From 3c480ecd117ccf7954bfc5242fc60af9a9f60fae Mon Sep 17 00:00:00 2001 From: James Mizen Date: Thu, 20 Feb 2025 09:18:13 +0000 Subject: [PATCH 1/2] Fix partial tie end alignment --- src/engraving/rendering/score/slurtielayout.cpp | 11 +++++------ vtest/scores/partialTieEndAlignment.mscz | Bin 0 -> 25252 bytes 2 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 vtest/scores/partialTieEndAlignment.mscz diff --git a/src/engraving/rendering/score/slurtielayout.cpp b/src/engraving/rendering/score/slurtielayout.cpp index 0c65841c0b008..8adec041f57e5 100644 --- a/src/engraving/rendering/score/slurtielayout.cpp +++ b/src/engraving/rendering/score/slurtielayout.cpp @@ -1852,7 +1852,6 @@ void SlurTieLayout::setPartialTieEndPos(PartialTie* item, SlurTiePos& sPos) const Segment* seg = chord->segment(); const Measure* measure = seg->measure(); const System* system = measure->system(); - double width = item->style().styleS(Sid::minHangingTieLength).val() * item->spatium(); if (seg->measure()->isFirstInSystem() && !outgoing) { sPos.p1 = PointF((system ? system->firstNoteRestSegmentX(true) : 0), sPos.p2.y()); @@ -1864,19 +1863,19 @@ void SlurTieLayout::setPartialTieEndPos(PartialTie* item, SlurTiePos& sPos) adjSeg = outgoing ? seg->next() : seg->prev(); } + double widthToSegment = 0.0; if (adjSeg) { EngravingItem* element = adjSeg->element(staff2track(item->vStaffIdx())); const double elementWidth = element ? element->width() : 0.0; - double widthToSegment = outgoing ? adjSeg->xPosInSystemCoords() - sPos.p1.x() : sPos.p2.x() - - (adjSeg->xPosInSystemCoords() + elementWidth); + widthToSegment = outgoing ? adjSeg->xPosInSystemCoords() - sPos.p1.x() : sPos.p2.x() + - (adjSeg->xPosInSystemCoords() + elementWidth); widthToSegment -= 0.25 * item->spatium(); - width = std::max(widthToSegment, width); } if (outgoing) { - sPos.p2 = PointF(sPos.p1.x() + width, sPos.p1.y()); + sPos.p2 = PointF(sPos.p1.x() + widthToSegment, sPos.p1.y()); } else { - sPos.p1 = PointF(sPos.p2.x() - width, sPos.p2.y()); + sPos.p1 = PointF(sPos.p2.x() - widthToSegment, sPos.p2.y()); } } diff --git a/vtest/scores/partialTieEndAlignment.mscz b/vtest/scores/partialTieEndAlignment.mscz new file mode 100644 index 0000000000000000000000000000000000000000..94912e2340d9e95769f15abb8895fde2bfe23df7 GIT binary patch literal 25252 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 literal 0 HcmV?d00001 From 74c4e8b2ca2386f7c76884613242472fb147202a Mon Sep 17 00:00:00 2001 From: James Mizen Date: Thu, 20 Feb 2025 11:17:02 +0000 Subject: [PATCH 2/2] find segments in adjacent measures if needed --- src/engraving/rendering/score/slurtielayout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engraving/rendering/score/slurtielayout.cpp b/src/engraving/rendering/score/slurtielayout.cpp index 8adec041f57e5..4596531e91005 100644 --- a/src/engraving/rendering/score/slurtielayout.cpp +++ b/src/engraving/rendering/score/slurtielayout.cpp @@ -1858,9 +1858,9 @@ void SlurTieLayout::setPartialTieEndPos(PartialTie* item, SlurTiePos& sPos) return; } - const Segment* adjSeg = outgoing ? seg->next() : seg->prev(); + const Segment* adjSeg = outgoing ? seg->next1() : seg->prev1(); while (adjSeg && (!adjSeg->isActive() || !adjSeg->enabled())) { - adjSeg = outgoing ? seg->next() : seg->prev(); + adjSeg = outgoing ? seg->next1() : seg->prev1(); } double widthToSegment = 0.0;