Don't skip tuplet when calling prev-element

musescore · Jun 19, 2024 · 2a27a41 · 2a27a41
1 parent 7c64784
commit 2a27a41
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/engraving/dom/navigate.cpp b/src/engraving/dom/navigate.cpp
@@ -866,7 +866,8 @@ EngravingItem* Score::prevElement()
         case ElementType::NOTE:
         case ElementType::REST:
         case ElementType::MMREST:
-        case ElementType::CHORD: {
+        case ElementType::CHORD:
+        case ElementType::TUPLET: {
             EngravingItem* prev = e->prevElement();
             if (prev) {
                 return prev;

diff --git a/src/engraving/dom/tuplet.cpp b/src/engraving/dom/tuplet.cpp
@@ -851,4 +851,16 @@ EngravingItem* Tuplet::nextElement()
     }
     return firstElement;
 }
+
+EngravingItem* Tuplet::prevElement()
+{
+    ChordRest* lastElement = toChordRest(elements().back());
+    if (lastElement) {
+        if (lastElement->isChord()) {
+            return toChord(lastElement)->notes().back();
+        }
+        return toRest(lastElement);
+    }
+    return lastElement;
+}
 } // namespace mu::engraving
diff --git a/src/engraving/dom/tuplet.h b/src/engraving/dom/tuplet.h
@@ -161,6 +161,7 @@ class Tuplet final : public DurationElement
     PointF bracketR[3];
 
     EngravingItem* nextElement() override;
+    EngravingItem* prevElement() override;
 
 private: