Merge pull request #26457 from mike-spa/alignAccidentalsToRightSide

Alignment corrections with accidentals of different sizes
musescore · Feb 18, 2025 · 988016f · 988016f
2 parents 12ba012 + d734506
commit 988016f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/engraving/rendering/score/accidentalslayout.cpp b/src/engraving/rendering/score/accidentalslayout.cpp
@@ -1031,7 +1031,8 @@ void AccidentalsLayout::collectVerticalSets(
         double x1 = xPosRelativeToSegment(acc1);
         for (size_t j = i + 1; j < ctx.allAccidentals.size(); ++j) {
             Accidental* acc2 = ctx.allAccidentals[j];
-            if (acc2->accidentalType() != acc1->accidentalType() || muse::contains(accidentalsAlreadyGrouped, acc2)) {
+            if (acc2->accidentalType() != acc1->accidentalType() || muse::contains(accidentalsAlreadyGrouped, acc2)
+                || !muse::RealIsEqual(acc1->mag(), acc2->mag())) {
                 continue;
             }
             int column2 = acc2->ldata()->column;
@@ -1057,10 +1058,12 @@ void AccidentalsLayout::alignVerticalSets(AccidentalGroups& vertSets, Accidental
         // Align the set
         double x = DBL_MAX;
         for (Accidental* acc : vertSet) {
-            x = std::min(x, xPosRelativeToSegment(acc));
+            double rightEdge = acc->ldata()->bbox().right() + xPosRelativeToSegment(acc);
+            x = std::min(x, rightEdge);
         }
         for (Accidental* acc : vertSet) {
-            setXposRelativeToSegment(acc, x);
+            double bboxRight = acc->ldata()->bbox().right();
+            setXposRelativeToSegment(acc, x - bboxRight);
         }
 
         // Re-check the outer ones for collisions

diff --git a/vtest/scores/accidental-38.mscz b/vtest/scores/accidental-38.mscz
diff --git a/vtest/scores/accidental-39.mscz b/vtest/scores/accidental-39.mscz