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

ProjectTree: keep lastFocusedProjectTreeWidget to get currentNode

Browse Source 
Also remove currentNode checks from updateFromDocumentManager()
We already checked for focus in the update() method.

Change-Id: Id1bc28ce442b5b56597a675516ceea4fbc1801de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tim Jenssen
2017-07-28 14:09:52 +02:00
parent 73c7cb19cf
commit e8c57c98d6
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/projectexplorer/projecttree.cpp
View File

@@ -131,8 +131,13 @@ void ProjectTree::nodeChanged(ProjectTreeWidget *widget)
void ProjectTree::update() void ProjectTree::update()
{ {
ProjectTreeWidget *focus = m_focusForContextMenu; ProjectTreeWidget *focus = m_focusForContextMenu;
if (!focus) static QPointer<ProjectTreeWidget> lastFocusedProjectTreeWidget;
if (!focus) {
focus = Utils::findOrDefault(m_projectTreeWidgets, &ProjectTree::hasFocus); focus = Utils::findOrDefault(m_projectTreeWidgets, &ProjectTree::hasFocus);
lastFocusedProjectTreeWidget = focus;
}
if (!focus)
focus = lastFocusedProjectTreeWidget;
if (focus) if (focus)
updateFromProjectTreeWidget(focus); updateFromProjectTreeWidget(focus);
@@ -150,16 +155,12 @@ void ProjectTree::updateFromProjectTreeWidget(ProjectTreeWidget *widget)
void ProjectTree::updateFromDocumentManager() void ProjectTree::updateFromDocumentManager()
{ {
Core::IDocument *document = Core::EditorManager::currentDocument(); if (Core::IDocument *document = Core::EditorManager::currentDocument()) {
const FileName fileName = document ? document->filePath() : FileName(); const FileName fileName = document->filePath();
updateFromNode(ProjectTreeWidget::nodeForFile(fileName));
Node *currentNode = nullptr; } else {
if (m_currentNode && m_currentNode->filePath() == fileName) updateFromNode(nullptr);
currentNode = m_currentNode; }
else
currentNode = ProjectTreeWidget::nodeForFile(fileName);
updateFromNode(currentNode);
} }
void ProjectTree::updateFromNode(Node *node) void ProjectTree::updateFromNode(Node *node)