Merge pull request #27811 from RomanPudashkin/452_port_fixes

Porting PRs to 4.5.2

Author: RomanPudashkin

src/instrumentsscene/view/layoutpaneltreemodel.cpp

@@ -157,6 +157,13 @@ bool LayoutPanelTreeModel::removeRows(int row, int count, const QModelIndex& par
     return true;
 }
 
+bool LayoutPanelTreeModel::shouldShowSystemObjectLayers() const
+{
+    // Only show system object staves in master score
+    // TODO: extend system object staves logic to parts
+    return m_notation && m_notation->isMaster();
+}
+
 void LayoutPanelTreeModel::initPartOrders()
 {
     m_sortedPartIdList.clear();
@@ -305,7 +312,7 @@ void LayoutPanelTreeModel::setupNotationConnections()
 
     m_notation->undoStack()->changesChannel().onReceive(this, [this](const mu::engraving::ScoreChangesRange& changes) {
         if (!m_layoutPanelVisible) {
-            m_shouldUpdateSystemObjectLayers = true;
+            m_scoreChanged = true;
             return;
         }
 
@@ -353,6 +360,8 @@ void LayoutPanelTreeModel::onScoreChanged(const mu::engraving::ScoreChangesRange
     for (AbstractLayoutPanelTreeItem* item : m_rootItem->childItems()) {
         item->onScoreChanged(changes);
     }
+
+    m_scoreChanged = false;
 }
 
 void LayoutPanelTreeModel::clear()
@@ -390,13 +399,16 @@ void LayoutPanelTreeModel::load()
     async::NotifyList<const Part*> masterParts = m_masterNotation->parts()->partList();
     sortParts(masterParts);
 
+    const bool showSystemObjectLayers = shouldShowSystemObjectLayers();
     const std::vector<Staff*>& systemObjectStaves = m_masterNotation->notation()->parts()->systemObjectStaves();
-    SystemObjectGroupsByStaff systemObjects = collectSystemObjectGroups(systemObjectStaves);
+
+    SystemObjectGroupsByStaff systemObjects;
+    if (showSystemObjectLayers) {
+        systemObjects = collectSystemObjectGroups(systemObjectStaves);
+    }
 
     for (const Part* part : masterParts) {
-        if (m_notation->isMaster()) {
-            // Only show system object staves in master score
-            // TODO: extend system object staves logic to parts
+        if (showSystemObjectLayers) {
             for (Staff* staff : part->staves()) {
                 if (muse::contains(systemObjectStaves, staff)) {
                     m_rootItem->appendChild(buildSystemObjectsLayerItem(staff, systemObjects[staff]));
@@ -454,7 +466,12 @@ void LayoutPanelTreeModel::setLayoutPanelVisible(bool visible)
 
     if (visible) {
         updateSelectedRows();
-        updateSystemObjectLayers();
+
+        if (m_scoreChanged) {
+            onScoreChanged();
+            m_shouldUpdateSystemObjectLayers = true;
+            updateSystemObjectLayers();
+        }
     }
 }
 
@@ -1051,6 +1068,10 @@ void LayoutPanelTreeModel::updateSystemObjectLayers()
         return;
     }
 
+    if (!shouldShowSystemObjectLayers()) {
+        return;
+    }
+
     TRACEFUNC;
 
     m_shouldUpdateSystemObjectLayers = false;

src/instrumentsscene/view/layoutpaneltreemodel.h

@@ -133,6 +133,8 @@ private slots:
     void onMasterNotationChanged();
     void onNotationChanged();
 
+    bool shouldShowSystemObjectLayers() const;
+
     void initPartOrders();
     void onBeforeChangeNotation();
     void setLoadingBlocked(bool blocked);
@@ -144,7 +146,7 @@ private slots:
     void setupNotationConnections();
 
     void updateSelectedRows();
-    void onScoreChanged(const mu::engraving::ScoreChangesRange& changes);
+    void onScoreChanged(const mu::engraving::ScoreChangesRange& changes = {});
 
     void clear();
     void deleteItems();
@@ -189,6 +191,7 @@ private slots:
     QHash<NotationKey, QList<muse::ID> > m_sortedPartIdList;
 
     bool m_layoutPanelVisible = true;
+    bool m_scoreChanged = false;
     bool m_shouldUpdateSystemObjectLayers = false;
 
     bool m_dragInProgress = false;

src/instrumentsscene/view/parttreeitem.cpp

@@ -42,34 +42,47 @@ void PartTreeItem::init(const notation::Part* masterPart)
     }
 
     const Part* part = notation()->parts()->part(masterPart->id());
-    bool partExists = part != nullptr;
-    bool visible = partExists && part->show();
+    m_partExists = part != nullptr;
+    bool visible = m_partExists && part->show();
 
-    if (!partExists) {
+    if (!m_partExists) {
         part = masterPart;
     }
 
     setId(part->id());
     setTitle(part->instrument()->nameAsPlainText());
     setIsVisible(visible);
-    setSettingsAvailable(partExists);
-    setSettingsEnabled(partExists);
-    setIsExpandable(partExists);
-    setIsRemovable(partExists);
+    setSettingsAvailable(m_partExists);
+    setSettingsEnabled(m_partExists);
+    setIsExpandable(m_partExists);
+    setIsRemovable(m_partExists);
 
     m_part = part;
-    m_isInited = true;
+    m_ignoreVisibilityChange = false;
 }
 
 const Part* PartTreeItem::part() const
 {
     return m_part;
 }
 
+void PartTreeItem::onScoreChanged(const mu::engraving::ScoreChangesRange&)
+{
+    if (!m_part) {
+        return;
+    }
+
+    setTitle(m_part->instrument()->nameAsPlainText());
+
+    m_ignoreVisibilityChange = true;
+    setIsVisible(m_partExists && m_part->show());
+    m_ignoreVisibilityChange = false;
+}
+
 void PartTreeItem::listenVisibilityChanged()
 {
     connect(this, &AbstractLayoutPanelTreeItem::isVisibleChanged, this, [this](bool isVisible) {
-        if (!m_isInited) {
+        if (m_ignoreVisibilityChange) {
             return;
         }
 

src/instrumentsscene/view/parttreeitem.h

@@ -59,12 +59,15 @@ class PartTreeItem : public AbstractLayoutPanelTreeItem, public muse::Injectable
     Q_INVOKABLE void resetAllFormatting();
 
 private:
+    void onScoreChanged(const mu::engraving::ScoreChangesRange& changes) override;
+
     void listenVisibilityChanged();
     void createAndAddPart(const muse::ID& masterPartId);
 
     size_t resolveNewPartIndex(const muse::ID& partId) const;
 
     const notation::Part* m_part = nullptr;
-    bool m_isInited = false;
+    bool m_ignoreVisibilityChange = true;
+    bool m_partExists = false;
 };
 }

src/notation/internal/notationparts.cpp

@@ -338,7 +338,7 @@ void NotationParts::listenUndoStackChanges()
     updatePartsAndSystemObjectStaves();
 
     m_undoStack->changesChannel().onReceive(this, [this](const ChangesRange& range) {
-        if (range.changedTypes.empty()) {
+        if (range.changedTypes.empty() || m_ignoreUndoStackChanges) {
             return;
         }
 
@@ -385,6 +385,9 @@ void NotationParts::updatePartsAndSystemObjectStaves(const mu::engraving::ScoreC
         m_systemObjectStavesChanged.notify();
     }
 
+    std::vector<Staff*> removedStaves;
+    std::vector<Staff*> addedStaves;
+
     for (auto& pair : range.changedItems) {
         if (!pair.first || !pair.first->isStaff()) {
             continue;
@@ -393,11 +396,19 @@ void NotationParts::updatePartsAndSystemObjectStaves(const mu::engraving::ScoreC
         Staff* staff = toStaff(pair.first);
 
         if (muse::contains(pair.second, CommandType::RemoveStaff)) {
-            notifyAboutStaffRemoved(staff);
+            removedStaves.push_back(staff);
         } else if (muse::contains(pair.second, CommandType::InsertStaff)) {
-            notifyAboutStaffAdded(staff);
+            addedStaves.push_back(staff);
         }
     }
+
+    for (Staff* staff : removedStaves) {
+        notifyAboutStaffRemoved(staff);
+    }
+
+    for (Staff* staff: addedStaves) {
+        notifyAboutStaffAdded(staff);
+    }
 }
 
 void NotationParts::doSetScoreOrder(const ScoreOrder& order)
@@ -487,7 +498,13 @@ bool NotationParts::setVoiceVisible(const ID& staffId, int voiceIndex, bool visi
 
     score()->excerpt()->setVoiceVisible(staff, voiceIndex, visible);
 
+    //! HACK: Excerpt::setVoiceVisible recreates the staff,
+    //! so later in listenUndoStackChanges() we will call notifyAboutStaffRemoved() and notifyAboutStaffAdded(),
+    //! which will result in the wrong UI state in the Layout panel.
+    //! We should not recreate the staff here, only update it
+    m_ignoreUndoStackChanges = true;
     apply();
+    m_ignoreUndoStackChanges = false;
 
     Staff* newStaff = staffModifiable(staffId);
     notifyAboutStaffChanged(newStaff);

src/notation/internal/notationparts.h

@@ -150,6 +150,8 @@ class NotationParts : public INotationParts, public muse::async::Asyncable
     std::vector<Staff*> m_systemObjectStaves;
     muse::async::Notification m_systemObjectStavesChanged;
 
+    bool m_ignoreUndoStackChanges = false;
+
     mutable muse::async::ChangedNotifier<const Part*> m_partChangedNotifier;
     mutable std::map<muse::ID, muse::async::ChangedNotifier<const Staff*> > m_staffChangedNotifierMap;
 };