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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
sweinreuter
2011-03-10 19:06:01 +01:00
parent 6b68e2955f 678fa25eef
commit a2c05ea573
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/actions/ResizeToolWindowAction.java
+1 -1
View File
@@ -93,7 +93,7 @@ public abstract class ResizeToolWindowAction extends AnAction implements DumbAwa
window = mgr.getToolWindow(mgr.getActiveToolWindowId());
}
if (window == null || !window.isAvailable() || !window.isVisible() || window.getType() == ToolWindowType.FLOATING) {
if (window == null || !window.isAvailable() || !window.isVisible() || window.getType() == ToolWindowType.FLOATING || !window.isActive()) {
setDisabled(e);
return;
}
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.java
+1
View File
@@ -131,6 +131,7 @@ public final class ToolWindowImpl implements ToolWindowEx {
public final boolean isActive() {
ApplicationManager.getApplication().assertIsDispatchThread();
if (myToolWindowManager.isEditorComponentActive()) return false;
return myToolWindowManager.isToolWindowActive(myId) || (myDecorator != null && myDecorator.isFocused());
}
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+5 -1
View File
@@ -1093,7 +1093,11 @@ public class AbstractPopup implements JBPopup {
myForcedLocation = screenPoint;
}
else {
moveTo(myContent, screenPoint, myLocateByContent ? myHeaderPanel.getPreferredSize() : null);
Insets insets = myPopupBorder.getBorderInsets(myContent);
if (insets == null) {
insets = new Insets(0, 0, 0, 0);
}
moveTo(myContent, new Point(screenPoint.x - insets.left, screenPoint.y - insets.top), myLocateByContent ? myHeaderPanel.getPreferredSize() : null);
}
}