fix #280347: reset inspector if property change leads to selection ch…

…ange
musescore · Dec 21, 2018 · e39e283 · e39e283
1 parent 7c71ea7
commit e39e283
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/mscore/inspector/inspector.cpp b/mscore/inspector/inspector.cpp
@@ -358,6 +358,7 @@ void Inspector::update(Score* s)
                               break;
                         }
                   }
+            connect(ie, &InspectorBase::elementChanged, this, QOverload<>::of(&Inspector::update), Qt::QueuedConnection);
             sa->setWidget(ie);      // will destroy previous set widget
 
             //focus policies were set by hand in each inspector_*.ui. this code just helps keeping them like they are

diff --git a/mscore/inspector/inspectorBase.cpp b/mscore/inspector/inspectorBase.cpp
@@ -384,7 +384,8 @@ void InspectorBase::valueChanged(int idx, bool reset)
       const InspectorItem& ii = iList[idx];
       Pid id       = ii.t;
       QVariant val2 = getValue(ii);                   // get new value from UI
-      Score* score  = inspector->element()->score();
+      Element* iElement = inspector->element();
+      Score* score  = iElement->score();
 
       score->startCmd();
       for (Element* e : *inspector->el()) {
@@ -413,6 +414,14 @@ void InspectorBase::valueChanged(int idx, bool reset)
       checkDifferentValues(ii);
       score->endCmd();
       inspector->setInspectorEdit(false);
+
+      if (iElement != inspector->element()) {
+            // Something changed in selection as a result of value change.
+            recursion = false;
+            emit elementChanged();
+            return;
+            }
+
       postInit();
 
       // a subStyle change may change several other values:

diff --git a/mscore/inspector/inspectorBase.h b/mscore/inspector/inspectorBase.h
@@ -54,6 +54,9 @@ class InspectorBase : public QWidget {
       bool compareValues(const InspectorItem& ii, QVariant a, QVariant b);
       Element* effectiveElement(const InspectorItem&) const;
 
+   signals:
+      void elementChanged();
+
    private slots:
       void resetToStyle();