MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixes after review

Browse Source 
1. return check for current window
2. reformat setSelectedEditor
This commit is contained in:
Sergey Malenkov
2018-05-30 15:33:39 +03:00
parent 5608bb7c73
commit 5376b6d261
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
+10 -9
View File
@@ -431,7 +431,8 @@ public class EditorWindow {
}
}
else if (myTabbedPane != null) {
final boolean focusEditor = ToolWindowManager.getInstance(getManager().getProject()).isEditorComponentActive();
final boolean focusEditor = this == myOwner.getCurrentWindow() &&
ToolWindowManager.getInstance(getManager().getProject()).isEditorComponentActive();
final VirtualFile currentFile = getSelectedFile();
if (currentFile != null) {
// do not close associated language console on tab placement change
@@ -648,14 +649,9 @@ public class EditorWindow {
}
public void setSelectedEditor(final EditorComposite editor, final boolean focusEditor) {
if (myTabbedPane == null) {
if (focusEditor && editor != null) {
JComponent preferred = editor.getPreferredFocusedComponent();
if (preferred != null) IdeFocusManager.findInstanceByComponent(preferred).requestFocus(preferred, true);
}
return;
}
if (editor != null) {
if (editor == null) return; // nothing to select or to focus
if (myTabbedPane != null) {
// select an editor in a tabbed pane and then focus an editor if needed
final int index = findFileIndex(editor.getFile());
if (index != -1) {
UIUtil.invokeLaterIfNeeded(() -> {
@@ -665,6 +661,11 @@ public class EditorWindow {
});
}
}
else if (focusEditor) {
// focus an editor in tabless mode
JComponent preferred = editor.getPreferredFocusedComponent();
if (preferred != null) IdeFocusManager.findInstanceByComponent(preferred).requestFocus(preferred, true);
}
}
public void setEditor(@Nullable final EditorWithProviderComposite editor, final boolean focusEditor) {