From b8535e4cf1f6c9fb1bd61b126dc8207575b5600a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 25 Oct 2023 15:58:15 +0200 Subject: [PATCH] Editors: Do not ignore DoNotMakeVisible `EditorManagerPrivate::activateEditor` first calls `placeEditor` and since 9295bfe3e47a83aa32b7d18f4f0082714528ab27 this calls `view->setCurrentEditor(...)` even if `DoNotChangeCurrentEditor` and `DoNotMakeVisible` are set. Do not call `view->setCurrentEditor` in `placeEditor`. That call is done if needed later in `activateEditor` (directly or via `setCurrentEditor`). Task-number: QTCREATORBUG-29644 Change-Id: I7d394b190428fedfd32d2a15df2ed0438332534d Reviewed-by: David Schulz --- src/plugins/coreplugin/editormanager/editormanager.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index ad31e04ea98..c41a3a880eb 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -1356,7 +1356,6 @@ IEditor *EditorManagerPrivate::placeEditor(EditorView *view, IEditor *editor) // pull the IEditor over to the new view sourceView->removeEditor(editor); view->addEditor(editor); - view->setCurrentEditor(editor); // possibly adapts old state to new layout editor->restoreState(state); if (!sourceView->currentEditor()) { @@ -1375,7 +1374,6 @@ IEditor *EditorManagerPrivate::placeEditor(EditorView *view, IEditor *editor) } } view->addEditor(editor); - view->setCurrentEditor(editor); // possibly adapts old state to new layout editor->restoreState(state); return editor;