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

AbstractPopup: fix storeLocation if myLocateByContent is true

Browse Source
This commit is contained in:
Sergey Malenkov
2016-07-26 20:05:07 +03:00
parent 883425c2df
commit 0a675d99a8
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+9 -11
View File
@@ -646,7 +646,7 @@ public class AbstractPopup implements JBPopup {
if (root != null) {
final Container popupWindow = root.getParent();
if (popupWindow != null && popupWindow.isShowing()) {
storeLocation(popupWindow.getLocationOnScreen());
storeLocation(fixLocateByContent(popupWindow.getLocationOnScreen(), true));
}
}
}
@@ -804,10 +804,7 @@ public class AbstractPopup implements JBPopup {
xy = myForcedLocation;
}
if (myLocateByContent) {
final Dimension captionSize = myHeaderPanel.getPreferredSize();
xy.y -= captionSize.height;
}
fixLocateByContent(xy, false);
Rectangle targetBounds = new Rectangle(xy, myContent.getPreferredSize());
Rectangle original = new Rectangle(targetBounds);
@@ -1555,14 +1552,9 @@ public class AbstractPopup implements JBPopup {
@Override
public Point getLocationOnScreen() {
Dimension headerCorrectionSize = myLocateByContent ? myHeaderPanel.getPreferredSize() : null;
Point screenPoint = myContent.getLocation();
SwingUtilities.convertPointToScreen(screenPoint, myContent);
if (headerCorrectionSize != null) {
screenPoint.y -= headerCorrectionSize.height;
}
return screenPoint;
return fixLocateByContent(screenPoint, false);
}
@@ -1884,6 +1876,12 @@ public class AbstractPopup implements JBPopup {
return e != null && e.getID() == KeyEvent.KEY_PRESSED && e.getKeyCode() == KeyEvent.VK_ESCAPE && e.getModifiers() == 0;
}
private Point fixLocateByContent(Point location, boolean save) {
Dimension size = !myLocateByContent ? null : myHeaderPanel.getPreferredSize();
if (size != null) location.y -= save ? -size.height : size.height;
return location;
}
private boolean isBusy() {
return myResizeListener != null && myResizeListener.isBusy() || myMoveListener != null && myMoveListener.isBusy();
}