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

Merge remote-tracking branch 'origin/4.14' into 4.15

Browse Source 
Change-Id: Ie467c5d63420041a9acffeb4a726130988ec0f41
This commit is contained in:
Eike Ziller
2021-03-18 09:29:51 +01:00
parent f348e952b8 38ce4fb4ec
commit 62011851ae
5 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/editormanager/editormanager.cpp
View File

@@ -1753,6 +1753,11 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
flags = EditorManager::DoNotSwitchToDesignMode;
activateEditorForDocument(view, document, flags);
}
} else {
// no documents left - set current view since view->removeEditor can
// trigger a focus change, context change, and updateActions, which
// requests the current EditorView
setCurrentView(currentView);
}
}
}
@@ -1766,10 +1771,12 @@ bool EditorManagerPrivate::closeEditors(const QList<IEditor*> &editors, CloseFla
foreach (IEditor *editor, acceptedEditors)
delete editor;
if (focusView)
if (focusView) {
activateView(focusView);
else
} else {
setCurrentView(currentView);
setCurrentEditor(currentView->currentEditor());
}
if (!EditorManager::currentEditor()) {
emit m_instance->currentEditorChanged(nullptr);