diff options
3 files changed, 13 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h index 09300aee3e..382388218b 100644 --- a/src/plugins/qmldesigner/designercore/include/viewmanager.h +++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h @@ -42,6 +42,7 @@ class DesignDocument; class AbstractCustomTool; class DesignerActionManager; class NodeInstanceView; +class RewriterView; namespace Internal { class DesignModeWidget; } @@ -98,6 +99,8 @@ public: void qmlJSEditorHelpId(const Core::IContext::HelpIdCallback &callback) const; DesignDocument *currentDesignDocument() const; + bool usesRewriterView(RewriterView *rewriterView); + private: // functions Q_DISABLE_COPY(ViewManager) diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index dedaf93654..c6cde7a320 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -873,8 +873,11 @@ void RewriterView::qmlTextChanged() amendQmlText(); } else { #ifndef QMLDESIGNER_TEST - QmlDesignerPlugin::instance()->viewManager().disableWidgets(); - m_amendTimer.start(400); + auto &viewManager = QmlDesignerPlugin::instance()->viewManager(); + if (viewManager.usesRewriterView(this)) { + QmlDesignerPlugin::instance()->viewManager().disableWidgets(); + m_amendTimer.start(400); + } #else /*Keep test synchronous*/ amendQmlText(); diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp index 7ebda714c4..9fca067862 100644 --- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp @@ -449,6 +449,11 @@ void ViewManager::reformatFileUsingTextEditorView() d->textEditorView.reformatFile(); } +bool ViewManager::usesRewriterView(RewriterView *rewriterView) +{ + return currentDesignDocument()->rewriterView() == rewriterView; +} + } // namespace QmlDesigner #endif //QMLDESIGNER_TEST |