Fix back navigation with articulation

review corrections
codecruisedor · Jul 11, 2023 · b2880d7 · b2880d7
1 parent c543239
commit b2880d7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/src/engraving/libmscore/chordrest.cpp b/src/engraving/libmscore/chordrest.cpp
@@ -976,7 +976,14 @@ EngravingItem* ChordRest::prevElement()
     }
     }
     staff_idx_t staffId = e->staffIdx();
-    return segment()->prevElement(staffId);
+    EngravingItem* prevItem = segment()->prevElement(staffId);
+    if (prevItem && prevItem->isNote()) {
+        const Chord* prevChord = toNote(prevItem)->chord();
+        if (prevChord && !prevChord->articulations().empty()) {
+            return prevChord->articulations().back();
+        }
+    }
+    return prevItem;
 }
 
 //---------------------------------------------------------

diff --git a/src/engraving/libmscore/segment.cpp b/src/engraving/libmscore/segment.cpp
@@ -1677,22 +1677,18 @@ EngravingItem* Segment::prevElementOfSegment(Segment* s, EngravingItem* e, staff
 
 EngravingItem* Segment::lastElementOfSegment(Segment* s, staff_idx_t activeStaff)
 {
-    std::vector<EngravingItem*> elements = s->elist();
-    for (auto i = --elements.end(); i != elements.begin(); --i) {
-        if (*i && (*i)->staffIdx() == activeStaff) {
-            if ((*i)->isChord()) {
-                return toChord(*i)->notes().front();
-            } else {
-                return *i;
+    const std::vector<EngravingItem*>& elements = s->elist();
+    for (auto it = elements.rbegin(); it != elements.rend(); ++it) {
+        EngravingItem* item = *it;
+        if (item && item->staffIdx() == activeStaff) {
+            if (item->isChord()) {
+                const std::vector<Articulation*>& articulations = toChord(item)->articulations();
+                if (!articulations.empty()) {
+                    return articulations.back();
+                }
+                return toChord(item)->upNote();
             }
-        }
-    }
-    auto i = elements.begin();
-    if (*i && (*i)->staffIdx() == activeStaff) {
-        if ((*i)->type() == ElementType::CHORD) {
-            return toChord(*i)->notes().front();
-        } else {
-            return *i;
+            return item;
         }
     }
     return nullptr;