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

RunDashboard: allow to remove content when RC tree is shown

Browse Source
This commit is contained in:
Konstantin Aleev
2018-05-30 12:56:50 +03:00
parent 922998ef5d
commit 5f407b61c6
2 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java
+1 -4
View File
@@ -147,10 +147,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab
public void contentRemoved(ContentManagerEvent event) {
Content content = event.getContent();
myContentActions.remove(content);
updateContentToolbar(content);
if (myContentManager.getContentCount() == 0 && !RunDashboardManager.getInstance(project).isShowConfigurations()) {
RunDashboardManager.getInstance(project).setShowConfigurations(true);
}
updateContentToolbar(myContentManager.getSelectedContent());
}
@Override
platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardManagerImpl.java
+46 -19
View File
@@ -160,6 +160,13 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
updateToolWindowContent();
updateDashboard(true);
}
@Override
public void contentRemoved(ContentManagerEvent event) {
if (myContentManager.getContentCount() == 0 && !isShowConfigurations()) {
setShowConfigurations(true);
}
}
});
}
@@ -209,6 +216,7 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
myToolWindowContentManager.addContent(myToolWindowContent);
myToolWindowContentManagerListener = new ToolWindowContentManagerListener();
myToolWindowContentManager.addContentManagerListener(myToolWindowContentManagerListener);
}
@Override
@@ -400,25 +408,26 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
return;
}
boolean containsConfigurationsContent = false;
for (Content content : myToolWindowContentManager.getContents()) {
if (myToolWindowContent.equals(content)) {
containsConfigurationsContent = true;
break;
}
}
if (myShowConfigurations) {
if (!myDashboardToToolWindowContents.isEmpty() || myToolWindowContentManager.getContentCount() == 0) {
if (!containsConfigurationsContent) {
myToolWindowContentManager.removeContentManagerListener(myToolWindowContentManagerListener);
myDashboardToToolWindowContents.clear();
myToolWindowContentManager.removeAllContents(true);
myToolWindowContentManager.addContent(myToolWindowContent);
Content content = myContentManager.getSelectedContent();
if (content != null) {
myToolWindowContent.setDisplayName(content.getDisplayName());
myToolWindowContent.setIcon(content.getIcon());
}
else {
myToolWindowContent.setDisplayName(null);
myToolWindowContent.setIcon(null);
}
updateToolWindowContentTabHeader(myContentManager.getSelectedContent());
myToolWindowContentManager.addContentManagerListener(myToolWindowContentManagerListener);
}
}
else {
if (myDashboardToToolWindowContents.isEmpty()) {
if (containsConfigurationsContent) {
myToolWindowContentManager.removeContentManagerListener(myToolWindowContentManagerListener);
myToolWindowContentManager.removeContent(myToolWindowContent, false);
for (Content dashboardContent : myContentManager.getContents()) {
@@ -471,6 +480,19 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
myDashboardToToolWindowContents.put(dashboardContent, toolWindowContent);
}
private void updateToolWindowContentTabHeader(@Nullable Content content) {
if (content != null) {
myToolWindowContent.setDisplayName(content.getDisplayName());
myToolWindowContent.setIcon(content.getIcon());
myToolWindowContent.setCloseable(true);
}
else {
myToolWindowContent.setDisplayName(null);
myToolWindowContent.setIcon(null);
myToolWindowContent.setCloseable(false);
}
}
@Nullable
@Override
public State getState() {
@@ -559,20 +581,23 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
if (myToolWindowContentManager == null || myToolWindowContent == null || !myShowConfigurations) return;
if (event.getOperation() == ContentManagerEvent.ContentOperation.add) {
myToolWindowContent.setDisplayName(event.getContent().getDisplayName());
myToolWindowContent.setIcon(event.getContent().getIcon());
}
else {
myToolWindowContent.setDisplayName(null);
myToolWindowContent.setIcon(null);
}
Content content = event.getOperation() == ContentManagerEvent.ContentOperation.add ? event.getContent() : null;
updateToolWindowContentTabHeader(content);
}
}
private class ToolWindowContentManagerListener extends ContentManagerAdapter {
@Override
public void contentRemoveQuery(ContentManagerEvent event) {
if (event.getContent().equals(myToolWindowContent)) {
Content content = myContentManager.getSelectedContent();
if (content != null) {
myContentManager.removeContent(content, true);
}
event.consume();
return;
}
Content dashboardContent = getDashboardContent(event.getContent());
if (dashboardContent == null || dashboardContent.getManager() == null) return;
@@ -585,6 +610,8 @@ public class RunDashboardManagerImpl implements RunDashboardManager, PersistentS
@Override
public void selectionChanged(ContentManagerEvent event) {
if (event.getContent().equals(myToolWindowContent)) return;
if (event.getOperation() != ContentManagerEvent.ContentOperation.add) return;
Content dashboardContent = getDashboardContent(event.getContent());