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

synchronous toolwindows initializing to prevent re-layout during startup

Browse Source
This commit is contained in:
Dmitry Avdeev
2016-09-21 16:17:51 +03:00
parent 37cb823f11
commit eeeac2b21a
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+14 -7
View File
@@ -391,8 +391,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
}, myProject);
}
private void initAll() {
List<FinalizableCommand> commandsList = new ArrayList<>();
private void initAll(List<FinalizableCommand> commandsList) {
appendUpdateToolWindowsPaneCmd(commandsList);
JComponent editorComponent = createEditorComponent(myProject);
@@ -402,19 +401,23 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
if (myEditorWasActive && editorComponent instanceof EditorsSplitters) {
activateEditorComponentImpl(commandsList, true);
}
execute(commandsList);
}
private static JComponent createEditorComponent(@NotNull Project project) {
return FrameEditorComponentProvider.EP.getExtensions()[0].createEditorComponent(project);
}
private void registerToolWindowsFromBeans() {
private void registerToolWindowsFromBeans(List<FinalizableCommand> list) {
List<ToolWindowEP> beans = Arrays.asList(Extensions.getExtensions(ToolWindowEP.EP_NAME));
for (ToolWindowEP bean : beans) {
Condition<Project> condition = bean.getCondition();
if (condition == null || condition.value(myProject)) {
EdtInvocationManager.getInstance().invokeLater(() -> initToolWindow(bean));
list.add(new FinalizableCommand(EmptyRunnable.INSTANCE) {
@Override
public void run() {
initToolWindow(bean);
}
});
}
}
}
@@ -2427,8 +2430,12 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
ToolWindowManagerEx ex = ToolWindowManagerEx.getInstanceEx(project);
if (ex instanceof ToolWindowManagerImpl) {
ToolWindowManagerImpl myManager = (ToolWindowManagerImpl)ex;
myManager.registerToolWindowsFromBeans();
EdtInvocationManager.getInstance().invokeLater(() -> myManager.initAll());
List<FinalizableCommand> list = new ArrayList<>();
myManager.registerToolWindowsFromBeans(list);
myManager.initAll(list);
EdtInvocationManager.getInstance().invokeLater(() -> {
myManager.execute(list);
});
}
}
}