QmlDesigner.documentcontroller: detach node instance view in edit mode

This patch detaches the node instance view in edit node.

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 2ddab40..6b16b86 100644 (file)
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -151,6 +151,19 @@ Model *DesignDocumentController::masterModel() const
     return m_d->masterModel.data();
 }
 
+
+void DesignDocumentController::detachNodeInstanceView()
+{
+    if (m_d->nodeInstanceView)
+        model()->detachView(m_d->nodeInstanceView.data());
+}
+
+void DesignDocumentController::attachNodeInstanceView()
+{
+    if (m_d->nodeInstanceView)
+        model()->attachView(m_d->nodeInstanceView.data());
+}
+
 QWidget *DesignDocumentController::centralWidget() const
 {
     return qobject_cast<QWidget*>(parent());
@@ -180,8 +193,10 @@ void DesignDocumentController::blockModelSync(bool block)
 
     if (m_d->textModifier) {
         if (m_d->syncBlocked) {
+            detachNodeInstanceView();
             m_d->textModifier->deactivateChangeSignals();
         } else {
+            attachNodeInstanceView();
             m_d->textModifier->reactivateChangeSignals();
         }
     }

diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
index 489dfc6..46b926f 100644 (file)
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.h
@@ -133,6 +133,8 @@ private slots:
     void changeCurrentModelTo(const ModelNode &node);
 
 private:
+    void detachNodeInstanceView();
+    void attachNodeInstanceView();
     QWidget *centralWidget() const;
     class DesignDocumentControllerPrivate *m_d;
     bool save(QIODevice *device, QString *errorMessage);