Merge pull request #23632 from mike-spa/takeIntoAccountInvisibleStave…

…sForCentering When centering elements between staves, take invisible staves into account
musescore · Jul 17, 2024 · df46037 · df46037
2 parents f457467 + 84d77d6
commit df46037
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/src/engraving/dom/system.cpp b/src/engraving/dom/system.cpp
@@ -321,6 +321,24 @@ staff_idx_t System::nextVisibleStaff(staff_idx_t staffIdx) const
     return firstVisibleStaffFrom(staffIdx + 1);
 }
 
+staff_idx_t System::prevVisibleStaff(staff_idx_t startStaffIdx) const
+{
+    for (staff_idx_t i = startStaffIdx;; --i) {
+        Staff* s  = score()->staff(i);
+        SysStaff* ss = m_staves[i];
+
+        if (s->show() && ss->show()) {
+            return i;
+        }
+
+        if (i == 0) {
+            break;
+        }
+    }
+
+    return muse::nidx;
+}
+
 //---------------------------------------------------------
 //   firstVisibleStaff
 //---------------------------------------------------------

diff --git a/src/engraving/dom/system.h b/src/engraving/dom/system.h
@@ -184,6 +184,7 @@ class System final : public EngravingItem
 
     staff_idx_t firstVisibleStaff() const;
     staff_idx_t nextVisibleStaff(staff_idx_t) const;
+    staff_idx_t prevVisibleStaff(staff_idx_t) const;
     double distance() const { return m_distance; }
     void setDistance(double d) { m_distance = d; }
 

diff --git a/src/engraving/rendering/dev/systemlayout.cpp b/src/engraving/rendering/dev/systemlayout.cpp
@@ -2833,11 +2833,9 @@ bool SystemLayout::elementShouldBeCenteredBetweenStaves(const EngravingItem* ite
             return false;
         }
     }
-    staff_idx_t nextIdx = item->placeAbove() ? thisIdx - 1 : thisIdx + 1;
 
-    const SysStaff* thisSystemStaff = system->staff(thisIdx);
-    const SysStaff* nextSystemStaff = system->staff(nextIdx);
-    if (!thisSystemStaff->show() || !nextSystemStaff->show()) {
+    staff_idx_t nextIdx = item->placeAbove() ? system->prevVisibleStaff(thisIdx) : system->nextVisibleStaff(thisIdx);
+    if (nextIdx == muse::nidx || !muse::contains(partStaves, item->score()->staff(nextIdx))) {
         return false;
     }
 
@@ -2853,7 +2851,10 @@ void SystemLayout::centerElementBetweenStaves(EngravingItem* element, const Syst
             return;
         }
     }
-    staff_idx_t nextIdx = isAbove ? thisIdx - 1 : thisIdx + 1;
+    staff_idx_t nextIdx = isAbove ? system->prevVisibleStaff(thisIdx) : system->nextVisibleStaff(thisIdx);
+    IF_ASSERT_FAILED(nextIdx != muse::nidx) {
+        return;
+    }
 
     SysStaff* thisStaff = system->staff(thisIdx);
     SysStaff* nextStaff = system->staff(nextIdx);