diff --git a/src/plugins/qmljseditor/qmljsoutline.cpp b/src/plugins/qmljseditor/qmljsoutline.cpp index 0c0797ab81e..cb513f1ab56 100644 --- a/src/plugins/qmljseditor/qmljsoutline.cpp +++ b/src/plugins/qmljseditor/qmljsoutline.cpp @@ -124,7 +124,7 @@ void QmlJSOutlineWidget::setEditor(QmlJSEditorWidget *editor) m_editor = editor; m_filterModel->setSourceModel(m_editor->qmlJsEditorDocument()->outlineModel()); - modelUpdated(); + m_treeView->expandAll(); connect(m_treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QmlJSOutlineWidget::updateSelectionInText); @@ -134,8 +134,9 @@ void QmlJSOutlineWidget::setEditor(QmlJSEditorWidget *editor) connect(m_editor, &QmlJSEditorWidget::outlineModelIndexChanged, this, &QmlJSOutlineWidget::updateSelectionInTree); - connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QmlOutlineModel::updated, - this, &QmlJSOutlineWidget::modelUpdated); + connect(m_editor->qmlJsEditorDocument()->outlineModel(), &QmlOutlineModel::updated, [this] () { + m_treeView->expandAll(); + }); } QList QmlJSOutlineWidget::filterMenuActions() const @@ -161,11 +162,6 @@ QVariantMap QmlJSOutlineWidget::settings() const return {{QLatin1String("QmlJSOutline.ShowBindings"), m_showBindingsAction->isChecked()}}; } -void QmlJSOutlineWidget::modelUpdated() -{ - m_treeView->expandAll(); -} - void QmlJSOutlineWidget::updateSelectionInTree(const QModelIndex &index) { if (!syncCursor()) @@ -230,7 +226,7 @@ void QmlJSOutlineWidget::focusEditor() void QmlJSOutlineWidget::setShowBindings(bool showBindings) { m_filterModel->setFilterBindings(!showBindings); - modelUpdated(); + m_treeView->expandAll(); updateSelectionInTree(m_editor->outlineModelIndex()); } diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h index 871e79e3351..a8f15c53e3a 100644 --- a/src/plugins/qmljseditor/qmljsoutline.h +++ b/src/plugins/qmljseditor/qmljsoutline.h @@ -76,7 +76,6 @@ public: virtual QVariantMap settings() const override; private: - void modelUpdated(); void updateSelectionInTree(const QModelIndex &index); void updateSelectionInText(const QItemSelection &selection); void updateTextCursor(const QModelIndex &index);