From 49d5a0541eab605e43e6b30f65beecbfd8daa364 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Fri, 22 Feb 2019 14:41:04 +0300 Subject: [PATCH] EA-129015 - assert: AbstractPopup.show --- .../intellij/ui/popup/PopupPositionManager.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ui/popup/PopupPositionManager.java b/platform/lang-impl/src/com/intellij/ui/popup/PopupPositionManager.java index c68111af76f3..8c1adc850251 100644 --- a/platform/lang-impl/src/com/intellij/ui/popup/PopupPositionManager.java +++ b/platform/lang-impl/src/com/intellij/ui/popup/PopupPositionManager.java @@ -223,13 +223,13 @@ public class PopupPositionManager { } if (popupRect != null) { - if (popup.isVisible()) { - popup.setLocation(new Point(r.x, r.y)); - } - else { + if (popup.canShow()) { final Point p = new Point(r.x - myRelativeOnScreen.x, r.y - myRelativeOnScreen.y); popup.show(new RelativePoint(myRelativeTo, p)); } + else { + popup.setLocation(new Point(r.x, r.y)); + } } else { // ok, popup does not fit, will try to resize it @@ -244,13 +244,13 @@ public class PopupPositionManager { d.width, d.height)); popup.setSize(crop.getSize()); - if (popup.isVisible()) { - popup.setLocation(crop.getLocation()); - } - else { + if (popup.canShow()) { popup.show(new RelativePoint(myRelativeTo, new Point(crop.getLocation().x - myRelativeOnScreen.x, crop.getLocation().y - myRelativeOnScreen.y))); } + else { + popup.setLocation(crop.getLocation()); + } } }