feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix node expand state caching for subcomponent edit case

Browse Source 
When detaching subcomponent edit model, we just update node expand
state cache for the file instead of recreating it from scratch.

Also, never collapse the current root node when attaching the model.

Fixes: QDS-5557
Change-Id: Id107940daccd9663ec4216de7dc8ae6a5bee8974
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2021-11-23 14:15:15 +02:00
parent 10d6bab932
commit cfaf169ea1
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View File

@@ -28,6 +28,7 @@
#include "navigatorwidget.h"
#include "qmldesignerconstants.h"
#include "qmldesignericons.h"
#include "qmldesignerplugin.h"
#include "nameitemdelegate.h"
#include "iconcheckboxitemdelegate.h"
@@ -166,9 +167,14 @@ void NavigatorView::modelAttached(Model *model)
const QHash<QString, bool> localExpandMap = m_expandMap[AbstractView::model()->fileUrl()];
auto it = localExpandMap.constBegin();
while (it != localExpandMap.constEnd()) {
const QModelIndex index = indexForModelNode(modelNodeForId(it.key()));
const ModelNode node = modelNodeForId(it.key());
// When editing subcomponent, the current root node may be marked collapsed in the
// full file view, but we never want to actually collapse it, so skip it.
if (!node.isRootNode()) {
const QModelIndex index = indexForModelNode(node);
if (index.isValid())
treeWidget()->setExpanded(index, it.value());
}
++it;
}
}
@@ -200,11 +206,18 @@ void NavigatorView::addNodeAndSubModelNodesToList(const ModelNode &node, QList<M
void NavigatorView::modelAboutToBeDetached(Model *model)
{
m_expandMap.remove(model->fileUrl());
QHash<QString, bool> &localExpandMap = m_expandMap[model->fileUrl()];
// If detaching full document model, recreate expand map from scratch to remove stale entries.
// Otherwise just update it (subcomponent edit case).
bool fullUpdate = true;
if (DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument())
fullUpdate = !document->inFileComponentModelActive();
if (fullUpdate)
localExpandMap.clear();
if (currentModel()) {
// Store expand state of the navigator tree
QHash<QString, bool> localExpandMap;
const ModelNode rootNode = rootModelNode();
const QModelIndex rootIndex = indexForModelNode(rootNode);
@@ -215,15 +228,18 @@ void NavigatorView::modelAboutToBeDetached(Model *model)
for (int i = 0; i < rowCount; ++i) {
const QModelIndex childIndex = currentModel()->index(i, 0, index);
const ModelNode node = modelNodeForIndex(childIndex);
if (node.isValid()) {
// Just store collapsed states as everything is expanded by default
if (node.isValid() && !treeWidget()->isExpanded(childIndex))
if (!treeWidget()->isExpanded(childIndex))
localExpandMap.insert(node.id(), false);
else if (!fullUpdate)
localExpandMap.remove(node.id());
}
gatherExpandedState(childIndex);
}
}
};
gatherExpandedState(rootIndex);
m_expandMap[model->fileUrl()] = localExpandMap;
}
AbstractView::modelAboutToBeDetached(model);