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

Editors: Do not ignore DoNotMakeVisible

Browse Source 
`EditorManagerPrivate::activateEditor` first calls `placeEditor` and
since 9295bfe3e4 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 <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2023-10-25 15:58:15 +02:00
parent 45d8d723b6
commit b8535e4cf1
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1356,7 +1356,6 @@ IEditor *EditorManagerPrivate::placeEditor(EditorView *view, IEditor *editor)
// pull the IEditor over to the new view // pull the IEditor over to the new view
sourceView->removeEditor(editor); sourceView->removeEditor(editor);
view->addEditor(editor); view->addEditor(editor);
view->setCurrentEditor(editor);
// possibly adapts old state to new layout // possibly adapts old state to new layout
editor->restoreState(state); editor->restoreState(state);
if (!sourceView->currentEditor()) { if (!sourceView->currentEditor()) {
@@ -1375,7 +1374,6 @@ IEditor *EditorManagerPrivate::placeEditor(EditorView *view, IEditor *editor)
} }
} }
view->addEditor(editor); view->addEditor(editor);
view->setCurrentEditor(editor);
// possibly adapts old state to new layout // possibly adapts old state to new layout
editor->restoreState(state); editor->restoreState(state);
return editor; return editor;