Merge pull request #27801 from RomanPudashkin/eye_button_fix

Fix #27791: Hide instrument and undo does not open "eye" icon

Author: RomanPudashkin

src/instrumentsscene/view/layoutpaneltreemodel.cpp

@@ -312,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;
         }
 
@@ -360,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()
@@ -464,7 +466,12 @@ void LayoutPanelTreeModel::setLayoutPanelVisible(bool visible)
 
     if (visible) {
         updateSelectedRows();
-        updateSystemObjectLayers();
+
+        if (m_scoreChanged) {
+            onScoreChanged();
+            m_shouldUpdateSystemObjectLayers = true;
+            updateSystemObjectLayers();
+        }
     }
 }
 

src/instrumentsscene/view/layoutpaneltreemodel.h

@@ -146,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();
@@ -191,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;
 };
 }