EA-69779 - NPE: AbstractPopup.getCenterOf

This commit is contained in:
Sergey Malenkov
2015-07-16 18:07:47 +03:00
parent c856ed5061
commit 4513e4365b
@@ -416,10 +416,14 @@ public class AbstractPopup implements JBPopup {
public static Point getCenterOf(final Component aContainer, final JComponent content) {
final JComponent component = getTargetComponent(aContainer);
Point containerScreenPoint = component.getVisibleRect().getLocation();
SwingUtilities.convertPointToScreen(containerScreenPoint, aContainer);
Rectangle visibleBounds = component != null
? component.getVisibleRect()
: new Rectangle(aContainer.getSize());
return UIUtil.getCenterPoint(new Rectangle(containerScreenPoint, component.getVisibleRect().getSize()), content.getPreferredSize());
Point containerScreenPoint = visibleBounds.getLocation();
SwingUtilities.convertPointToScreen(containerScreenPoint, aContainer);
visibleBounds.setLocation(containerScreenPoint);
return UIUtil.getCenterPoint(visibleBounds, content.getPreferredSize());
}
@Override