Merge pull request musescore#26365 from mike-spa/fixDynamicCenteringBug

Fix wrong interaction between hairpins and dynamics when centering
rettinghaus · Feb 10, 2025 · 9af8b2d · 9af8b2d
2 parents 42bdfb2 + 441c37a
commit 9af8b2d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/engraving/rendering/score/autoplace.cpp b/src/engraving/rendering/score/autoplace.cpp
@@ -442,13 +442,22 @@ void Autoplace::doAutoplace(const Articulation* item, Articulation::LayoutData*
 
 bool Autoplace::itemsShouldIgnoreEachOther(const EngravingItem* itemToAutoplace, const EngravingItem* itemInSkyline)
 {
+    if (itemInSkyline->isText() && itemInSkyline->explicitParent() && itemInSkyline->parent()->isSLineSegment()) {
+        return itemsShouldIgnoreEachOther(itemToAutoplace, itemInSkyline->parentItem());
+    }
+
     ElementType type1 = itemToAutoplace->type();
     ElementType type2 = itemInSkyline->type();
 
     if (type1 == ElementType::TIMESIG) {
         return type2 != ElementType::KEYSIG;
     }
 
+    if ((type1 == ElementType::DYNAMIC || type1 == ElementType::HAIRPIN_SEGMENT)
+        && (type2 == ElementType::DYNAMIC || type2 == ElementType::HAIRPIN_SEGMENT)) {
+        return true;
+    }
+
     if (type1 == type2) {
         // Items of same type should ignore each other in most cases
         static const std::set<ElementType> TEXT_BASED_TYPES_WHICH_IGNORE_EACH_OTHER {

diff --git a/src/engraving/rendering/score/systemlayout.cpp b/src/engraving/rendering/score/systemlayout.cpp
@@ -2946,9 +2946,7 @@ void SystemLayout::centerElementBetweenStaves(EngravingItem* element, const Syst
         if (!shapeItem) {
             return false;
         }
-        return shapeItem == element || shapeItem->parentItem(true) == element || shapeItem->type() == element->type()
-               || shapeItem->isAccidental() || shapeItem == element->ldata()->itemSnappedBefore()
-               || shapeItem == element->ldata()->itemSnappedAfter();
+        return shapeItem->isAccidental() || Autoplace::itemsShouldIgnoreEachOther(element, shapeItem);
     });
 
     double yStaffDiff = nextStaff->y() - thisStaff->y();

diff --git a/vtest/scores/hairpins-3.mscz b/vtest/scores/hairpins-3.mscz