From fdc313450baf1bdf11743cfc319d4037cf897ac5 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Wed, 22 Oct 2014 19:53:46 +0400 Subject: [PATCH] IDEA-131592 Menu disappeared after debugging Node application --- .../platform-impl/src/com/intellij/ui/BalloonImpl.java | 9 +++++++++ .../com/intellij/xdebugger/impl/ui/BreakpointEditor.java | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index d41d0bb5ef18..88353779a83c 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -57,6 +57,7 @@ import java.awt.geom.GeneralPath; import java.awt.geom.Rectangle2D; import java.awt.geom.RoundRectangle2D; import java.awt.image.BufferedImage; +import java.util.List; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; @@ -792,6 +793,7 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui { private void hideAndDispose(final boolean ok) { if (myDisposed) return; myDisposed = true; + hideComboBoxPopups(); final Runnable disposeRunnable = new Runnable() { @Override @@ -827,6 +829,13 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui { myTracker = null; } + private void hideComboBoxPopups() { + List comboBoxes = UIUtil.findComponentsOfType(myComp, JComboBox.class); + for (JComboBox box : comboBoxes) { + box.hidePopup(); + } + } + protected void onDisposed() { } @Override diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java index 5c14020f603f..79c8dc49c398 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/BreakpointEditor.java @@ -90,10 +90,6 @@ public class BreakpointEditor { } public void actionPerformed(AnActionEvent e) { - Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(e.getDataContext()); - if (component instanceof JComboBox && SwingUtilities.isDescendingFrom(component, getMainPanel())) { - ((JComboBox)component).hidePopup(); - } done(); } };