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-149061 Tool Window docking issue

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2017-12-26 00:15:02 +03:00
parent 4ecd484afa
commit baa940b8c1
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+7 -2
View File
@@ -1609,13 +1609,18 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
myLayout.setSplitMode(id, isSplit);
boolean wasActive = info.isActive();
if (wasActive) {
deactivateToolWindowImpl(id, true, commandList);
boolean wasVisible = info.isVisible();
// We should hide the window and show it in a 'new place' to automatically hide possible window that is already located in a 'new place'
if (wasActive || wasVisible) {
hideToolWindow(id, false);
}
final WindowInfoImpl[] infos = myLayout.getInfos();
for (WindowInfoImpl info1 : infos) {
appendApplyWindowInfoCmd(info1, commandList);
}
if (wasVisible || wasActive) {
showToolWindowImpl(id, true, commandList);
}
if (wasActive) {
activateToolWindowImpl(id, commandList, true, true);
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java
+29 -7
View File
@@ -45,6 +45,7 @@ import java.awt.image.BufferedImage;
import java.lang.ref.Reference;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
/**
@@ -328,7 +329,7 @@ public final class ToolWindowsPane extends JBLayeredPane implements UISettingsLi
return myId2Button.get(id);
}
private Component getDecoratorById(final String id) {
private InternalDecorator getDecoratorById(final String id) {
return myId2Decorator.get(id);
}
@@ -827,22 +828,43 @@ public final class ToolWindowsPane extends JBLayeredPane implements UISettingsLi
});
}
JComponent c = getComponentAt(anchor);
//If all components are hidden for anchor we should find the second component to put in a splitter
//Otherwise we add empty splitter
if (c == null) {
List<String> ids = ToolWindowsPane.this.myManager.getIdsOn(anchor);
ids.remove(myInfo.getId());
for (Iterator<String> iterator = ids.iterator(); iterator.hasNext(); ) {
String id = iterator.next();
ToolWindow window = myManager.getToolWindow(id);
if (window == null || window.isSplitMode() == myInfo.isSplit() || !window.isVisible()) iterator.remove();
}
if (!ids.isEmpty()) {
InternalDecorator anotherDecorator = getDecoratorById(ids.get(0));
if (anotherDecorator!= null) {
c = anotherDecorator;
}
}
if (c == null) {
LOG.error("Empty splitter @ " + anchor + " during AddAndSplitDockedComponentCmd for " + myInfo.getId());
}
}
float newWeight;
if (c instanceof InternalDecorator) {
InternalDecorator oldComponent = (InternalDecorator)c;
WindowInfoImpl oldInfo = oldComponent.getWindowInfo();
if (myInfo.isSplit()) {
splitter.setFirstComponent(oldComponent);
splitter.setSecondComponent(myNewComponent);
float proportion = getPreferredSplitProportion(oldComponent.getWindowInfo().getId(),
normalizeWeigh(oldComponent.getWindowInfo().getSideWeight() /
(oldComponent.getWindowInfo().getSideWeight() +
float proportion = getPreferredSplitProportion(oldInfo.getId(),
normalizeWeigh(oldInfo.getSideWeight() /
(oldInfo.getSideWeight() +
myInfo.getSideWeight())));
splitter.setProportion(proportion);
if (!anchor.isHorizontal() && !anchor.isSplitVertically()) {
newWeight = normalizeWeigh(oldComponent.getWindowInfo().getWeight() + myInfo.getWeight());
newWeight = normalizeWeigh(oldInfo.getWeight() + myInfo.getWeight());
}
else {
newWeight = normalizeWeigh(oldComponent.getWindowInfo().getWeight());
newWeight = normalizeWeigh(oldInfo.getWeight());
}
}
else {
@@ -850,7 +872,7 @@ public final class ToolWindowsPane extends JBLayeredPane implements UISettingsLi
splitter.setSecondComponent(oldComponent);
splitter.setProportion(normalizeWeigh(myInfo.getSideWeight()));
if (!anchor.isHorizontal() && !anchor.isSplitVertically()) {
newWeight = normalizeWeigh(oldComponent.getWindowInfo().getWeight() + myInfo.getWeight());
newWeight = normalizeWeigh(oldInfo.getWeight() + myInfo.getWeight());
}
else {
newWeight = normalizeWeigh(myInfo.getWeight());