Skip to content
Snippets Groups Projects
Commit 03aa3672 authored by Thomas Hartmann's avatar Thomas Hartmann Committed by Thomas Hartmann
Browse files

QmlDesigner: Fix for the navigator


If we update a subtree, because a node was moved or reparented, we
have to expand this subtree.

Change-Id: I7f8f004b649a695dddddde4dbec5af19c700d109
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent e7b642eb
Branches
Tags
No related merge requests found
...@@ -160,7 +160,7 @@ void NavigatorView::nodeAboutToBeRemoved(const ModelNode &removedNode) ...@@ -160,7 +160,7 @@ void NavigatorView::nodeAboutToBeRemoved(const ModelNode &removedNode)
m_treeModel->removeSubTree(removedNode); m_treeModel->removeSubTree(removedNode);
} }
void NavigatorView::nodeReparented(const ModelNode &node, const NodeAbstractProperty & /*newPropertyParent*/, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/) void NavigatorView::nodeReparented(const ModelNode &node, const NodeAbstractProperty & newPropertyParent, const NodeAbstractProperty & /*oldPropertyParent*/, AbstractView::PropertyChangeFlags /*propertyChange*/)
{ {
bool blocked = blockSelectionChangedSignal(true); bool blocked = blockSelectionChangedSignal(true);
...@@ -172,6 +172,11 @@ void NavigatorView::nodeReparented(const ModelNode &node, const NodeAbstractProp ...@@ -172,6 +172,11 @@ void NavigatorView::nodeReparented(const ModelNode &node, const NodeAbstractProp
// make sure selection is in sync again // make sure selection is in sync again
updateItemSelection(); updateItemSelection();
if (newPropertyParent.parentModelNode().isValid()) {
QModelIndex index = m_treeModel->indexForNode(newPropertyParent.parentModelNode());
treeWidget()->expand(index);
}
blockSelectionChangedSignal(blocked); blockSelectionChangedSignal(blocked);
} }
...@@ -223,6 +228,10 @@ void NavigatorView::nodeOrderChanged(const NodeListProperty &listProperty, const ...@@ -223,6 +228,10 @@ void NavigatorView::nodeOrderChanged(const NodeListProperty &listProperty, const
if (node.isInHierarchy()) if (node.isInHierarchy())
m_treeModel->addSubTree(listProperty.parentModelNode()); m_treeModel->addSubTree(listProperty.parentModelNode());
if (listProperty.parentModelNode().isValid()) {
QModelIndex index = m_treeModel->indexForNode(listProperty.parentModelNode());
treeWidget()->expand(index);
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment