forked from qt-creator/qt-creator
Editors: Do not ignore DoNotMakeVisible
`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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user