From 70401e7ffa1beedf2639efe75089d6ad3c67626b Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Mon, 17 Oct 2016 18:43:14 +0300 Subject: [PATCH] IDEA-162678 Version Control Local Changes (Git) does not grab focus when opened --- .../com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java index 5670ecc8410b..2ef6de9cbb90 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java @@ -451,13 +451,12 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements toolWindow.setSplitMode(true, null); } - final ActionCallback activation = toolWindow.setActivation(new ActionCallback()); - + // ToolWindow activation is not needed anymore and should be removed in 2017 + toolWindow.setActivation(new ActionCallback()).setDone(); final DumbAwareRunnable runnable = () -> { if (toolWindow.isDisposed()) return; toolWindow.ensureContentInitialized(); - activation.setDone(); }; if (visible || ApplicationManager.getApplication().isUnitTestMode()) { runnable.run();