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

fix testDockableContainer

Browse Source 
GitOrigin-RevId: 3ccc05e514b7e581777c49d4f0c57e58f7d9d46d
This commit is contained in:
Vladimir Krivosheev
2020-01-09 19:08:43 +00:00
committed by intellij-monorepo-bot
parent 1e4d3885ed
commit bdb70a4973
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
+18 -9
View File
@@ -378,14 +378,18 @@ public final class DockManagerImpl extends DockManager implements PersistentStat
}
@NotNull
public Pair<FileEditor[], FileEditorProvider[]> createNewDockContainerFor(@NotNull VirtualFile file, @NotNull FileEditorManagerImpl fileEditorManager) {
public Pair<FileEditor[], FileEditorProvider[]> createNewDockContainerFor(@NotNull VirtualFile file,
@NotNull FileEditorManagerImpl fileEditorManager) {
DockContainer container = getFactory(DockableEditorContainerFactory.TYPE).createContainer(null);
register(container);
DockWindow window = createWindowFor(null, container);
window.show(true);
final EditorWindow editorWindow = ((DockableEditorTabbedContainer)container).getSplitters().getOrCreateCurrentWindow(file);
final Pair<FileEditor[], FileEditorProvider[]> result = fileEditorManager.openFileImpl2(editorWindow, file, true);
if (!ApplicationManager.getApplication().isHeadlessEnvironment()) {
window.show(true);
}
EditorWindow editorWindow = ((DockableEditorTabbedContainer)container).getSplitters().getOrCreateCurrentWindow(file);
Pair<FileEditor[], FileEditorProvider[]> result = fileEditorManager.openFileImpl2(editorWindow, file, true);
container.add(EditorTabbedContainer.createDockableEditor(myProject, null, file, new Presentation(file.getName()), editorWindow), null);
SwingUtilities.invokeLater(() -> window.myUiContainer.setPreferredSize(null));
@@ -416,11 +420,13 @@ public final class DockManagerImpl extends DockManager implements PersistentStat
myContainer = container;
setProject(project);
if (!(container instanceof DockContainer.Dialog)) {
if (!ApplicationManager.getApplication().isHeadlessEnvironment() && !(container instanceof DockContainer.Dialog)) {
StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
Window frame = getFrame();
if (statusBar != null && frame instanceof IdeFrame) {
setStatusBar(statusBar.createChild((IdeFrame)frame));
if (statusBar != null) {
Window frame = getFrame();
if (frame instanceof IdeFrame) {
setStatusBar(statusBar.createChild((IdeFrame)frame));
}
}
}
@@ -467,7 +473,10 @@ public final class DockManagerImpl extends DockManager implements PersistentStat
}
private void updateNorthPanel() {
if (ApplicationManager.getApplication().isUnitTestMode()) return;
if (ApplicationManager.getApplication().isUnitTestMode()) {
return;
}
myNorthPanel.setVisible(UISettings.getInstance().getShowNavigationBar()
&& !(myContainer instanceof DockContainer.Dialog)
&& !UISettings.getInstance().getPresentationMode());