Fix moveSegment for Harmony and FretDiagram

Need to guarantee that they can always attach to a ChordRest segment

Author: mike-spa

src/engraving/dom/anchors.cpp

@@ -279,10 +279,8 @@ void MoveElementAnchors::moveSegment(EngravingItem* element, Segment* newSeg, Fr
         doMoveSegment(toFiguredBass(element), newSeg, tickDiff);
         break;
     case ElementType::HARMONY:
-        doMoveSegment(toHarmony(element), newSeg, tickDiff);
-        break;
     case ElementType::FRET_DIAGRAM:
-        doMoveSegment(toFretDiagram(element), newSeg, tickDiff);
+        doMoveHarmonyOrFretDiagramSegment(element, newSeg, tickDiff);
         break;
     default:
         doMoveSegment(toEngravingItem(element), newSeg, tickDiff);
@@ -365,37 +363,30 @@ void MoveElementAnchors::doMoveSegment(FiguredBass* element, Segment* newSeg, Fr
     }
 }
 
-void MoveElementAnchors::doMoveSegment(Harmony* element, Segment* newSeg, Fraction tickDiff)
+void MoveElementAnchors::doMoveHarmonyOrFretDiagramSegment(EngravingItem* element, Segment* newSeg, Fraction tickDiff)
 {
-    if (newSeg->isTimeTickType()) {
-        Measure* measure = newSeg->measure();
-        Segment* chordRestSegAtSameTick = measure->undoGetSegment(SegmentType::ChordRest, newSeg->tick());
-        newSeg = chordRestSegAtSameTick;
+    for (EngravingObject* item : element->linkList()) {
+        Score* score = item->score();
+        Measure* measure = score->tick2measure(newSeg->tick());
+        Segment* chordRestSeg = measure->undoGetSegment(SegmentType::ChordRest, newSeg->tick());
+        if (item == element) {
+            newSeg = chordRestSeg;
+        }
     }
 
-    Segment* oldSegment = toSegment(element->parent());
-    doMoveSegment(toEngravingItem(element), newSeg, tickDiff);
-
-    oldSegment->checkEmpty();
-    if (oldSegment->empty()) {
-        element->score()->undoRemoveElement(oldSegment);
-    }
-}
+    Fraction oldTick = element->tick();
 
-void MoveElementAnchors::doMoveSegment(FretDiagram* element, Segment* newSeg, Fraction tickDiff)
-{
-    if (newSeg->isTimeTickType()) {
-        Measure* measure = newSeg->measure();
-        Segment* chordRestSegAtSameTick = measure->undoGetSegment(SegmentType::ChordRest, newSeg->tick());
-        newSeg = chordRestSegAtSameTick;
-    }
-
-    Segment* oldSegment = toSegment(element->parent());
     doMoveSegment(toEngravingItem(element), newSeg, tickDiff);
 
-    oldSegment->checkEmpty();
-    if (oldSegment->empty()) {
-        element->score()->undoRemoveElement(oldSegment);
+    for (EngravingObject* item : element->linkList()) {
+        Score* score = item->score();
+        Segment* oldSegment = score->tick2segment(oldTick, true, SegmentType::ChordRest, false);
+        if (oldSegment) {
+            oldSegment->checkEmpty();
+            if (oldSegment->empty()) {
+                score->undoRemoveElement(oldSegment);
+            }
+        }
     }
 }
 

src/engraving/dom/anchors.h

@@ -53,8 +53,7 @@ class MoveElementAnchors
 
     static void doMoveSegment(EngravingItem* element, Segment* newSeg, Fraction tickDiff);
     static void doMoveSegment(FiguredBass* element, Segment* newSeg, Fraction tickDiff);
-    static void doMoveSegment(Harmony* element, Segment* newSeg, Fraction tickDiff);
-    static void doMoveSegment(FretDiagram* element, Segment* newSeg, Fraction tickDiff);
+    static void doMoveHarmonyOrFretDiagramSegment(EngravingItem* element, Segment* newSeg, Fraction tickDiff);
 
     static void moveSnappedItems(EngravingItem* element, Segment* newSeg, Fraction tickDiff);
     static void rebaseOffsetOnMoveSegment(EngravingItem* element, const PointF& curOffset, Segment* newSeg, Segment* oldSeg);