From 7404e8a526717727ded6e0c27c7de4e504153dfc Mon Sep 17 00:00:00 2001 From: Kirill Kalishev Date: Thu, 12 May 2011 16:09:36 +0400 Subject: [PATCH] [xena] IDEA-69514 Ctrl-N popup broken [rev=anna.kozlova] --- .../src/com/intellij/ui/popup/AbstractPopup.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 773ddcdb6288..8f6664ba10ae 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -147,7 +147,6 @@ public class AbstractPopup implements JBPopup { private JTextField mySpeedSearchPatternField; private boolean myNativePopup; private boolean myMayBeParent; - private JLabel myAdCmp; private AbstractPopup.SpeedSearchKeyListener mySearchKeyListener; private JLabel myAdComponent; @@ -206,8 +205,7 @@ public class AbstractPopup implements JBPopup { myContent.add(component, BorderLayout.CENTER); if (adText != null) { - myAdCmp = HintUtil.createAdComponent(adText, HintUtil.getDefaultAdComponentBorder(), adTextAlignment); - myContent.add(myAdCmp, BorderLayout.SOUTH); + setAdText(adText, adTextAlignment); } myCancelKeyEnabled = cancelKeyEnabled; @@ -1196,6 +1194,9 @@ public class AbstractPopup implements JBPopup { } private Dimension computeWindowSize(Dimension size) { + if (myAdComponent != null && myAdComponent.isShowing()) { + size.height += myAdComponent.getPreferredSize().height + 1; + } return size; }