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

IDEA-208629 RunDashboard: do not hide tool window on 'Show Configurations' action if not pinned

Browse Source
This commit is contained in:
Konstantin Aleev
2019-03-19 13:22:02 +03:00
parent fe493dbbe9
commit c9e006acda
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java
+26 -6
View File
@@ -33,7 +33,6 @@ import com.intellij.openapi.wm.ToolWindowId;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.openapi.wm.impl.ToolWindowImpl;
import com.intellij.openapi.wm.impl.content.ToolWindowContentUi;
import com.intellij.ui.AppUIUtil;
import com.intellij.ui.content.*;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBusConnection;
@@ -291,8 +290,25 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
@Override
public void setShowConfigurations(boolean value) {
myShowConfigurations = value;
updateToolWindowContent();
// Ensure dashboard tree gets focus before tool window content update.
ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
if (toolWindowManager == null) return;
toolWindowManager.invokeLater(() -> {
if (myProject.isDisposed()) {
return;
}
if (myToolWindowContentManager != null) {
Content content = myToolWindowContentManager.getSelectedContent();
if (content != null && content.equals(myToolWindowContent)) {
myToolWindowContentManager.setSelectedContent(content, true);
}
}
});
// Hide or show dashboard tree at first in order to get focus events on tree component which will be added/removed from tool window.
updateDashboard(false);
// Add or remove dashboard tree content from tool window.
updateToolWindowContent();
}
@Override
@@ -429,7 +445,14 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
}
private void updateToolWindowContent() {
AppUIUtil.invokeLaterIfProjectAlive(myProject, () -> {
ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
if (toolWindowManager == null) return;
toolWindowManager.invokeLater(() -> {
if (myProject.isDisposed()) {
return;
}
if (myToolWindowContent == null || myToolWindowContentManager == null ||
myToolWindowContentManagerListener == null) {
return;
@@ -475,9 +498,6 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
}
}
ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
if (toolWindowManager == null) return;
ToolWindow toolWindow = toolWindowManager.getToolWindow(getToolWindowId());
if (toolWindow instanceof ToolWindowImpl) {
ToolWindowContentUi contentUi = ((ToolWindowImpl)toolWindow).getContentUI();