Merge pull request #29529 from mike-spa/portStuff

Port stuff

Author: miiizen

src/engraving/dom/staff.cpp

@@ -106,7 +106,7 @@ staff_idx_t Staff::idx() const
 
 void Staff::triggerLayout() const
 {
-    score()->setLayoutAll(idx());
+    score()->setLayoutAll(idx(), this);
 }
 
 void Staff::triggerLayout(const Fraction& tick)
@@ -231,7 +231,7 @@ void Staff::undoSetShowMeasureNumbers(bool show)
 bool Staff::shouldShowMeasureNumbers() const
 {
     if (style().styleB(Sid::measureNumberAllStaves)) {
-        return true;
+        return show();
     }
 
     bool isTopStave = score()->staves().front() == this;

src/instrumentsscene/view/systemobjectslayertreeitem.cpp

@@ -161,7 +161,7 @@ void SystemObjectsLayerTreeItem::onScoreChanged(const mu::engraving::ScoreChange
             continue;
         }
 
-        bool isSystemObj = item->systemFlag();
+        bool isSystemObj = item->systemFlag() || (item->isStaff() && toStaff(item)->isSystemObjectStaff());
         if (!isSystemObj && item->isTimeSig()) {
             isSystemObj = toTimeSig(item)->timeSigPlacement() != TimeSigPlacement::NORMAL;
         }
@@ -175,7 +175,8 @@ void SystemObjectsLayerTreeItem::onScoreChanged(const mu::engraving::ScoreChange
             continue;
         }
 
-        if (item->staffIdx() != m_staffIdx) {
+        staff_idx_t staffIdx = item->isStaff() ? toStaff(item)->idx() : item->staffIdx();
+        if (staffIdx != m_staffIdx) {
             continue;
         }
 
@@ -190,6 +191,7 @@ void SystemObjectsLayerTreeItem::onScoreChanged(const mu::engraving::ScoreChange
             shouldUpdateState |= addSystemObject(item);
         } else if (muse::contains(pair.second, CommandType::ChangeProperty)) {
             shouldUpdateState |= muse::contains(changes.changedPropertyIdSet, Pid::VISIBLE);
+            shouldUpdateState |= muse::contains(changes.changedPropertyIdSet, Pid::SHOW_MEASURE_NUMBERS);
         }
     }
 

src/notation/internal/notationparts.cpp

@@ -860,6 +860,12 @@ void NotationParts::moveSystemObjects(const ID& sourceStaffId, const ID& destina
         score()->undoChangeStyleVal(Sid::systemObjectsBelowBottomStaff, false);
     }
 
+    AutoOnOff showMeasNumOnSrcStaff = srcStaff->getProperty(Pid::SHOW_MEASURE_NUMBERS).value<AutoOnOff>();
+    if (showMeasNumOnSrcStaff != AutoOnOff::AUTO) {
+        dstStaff->undoChangeProperty(Pid::SHOW_MEASURE_NUMBERS, showMeasNumOnSrcStaff);
+        srcStaff->undoResetProperty(Pid::SHOW_MEASURE_NUMBERS);
+    }
+
     // Remove items first
     for (EngravingItem* item : systemObjects) {
         if (item->isTimeSig()) {