fix popups: heavy/medium: restore state of factory after popup creation + delegate...

[idea/community.git] / platform / platform-impl / src / com / intellij / ui / popup / AbstractPopup.java

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 6f95abdfc7d04e8c17b7e65b7756f2c6c281cb07..db179130e98b17ff91d3767ecc8b0d77dc97025f 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -710,7 +710,10 @@ public class AbstractPopup implements JBPopup {
     }
 
     if (myWindow != null) {
-      if (!myMayBeParent) {
+      // dialogwrapper-based popups do this internally through peer,
+      // for other popups like jdialog-based we should exclude them manually, but
+      // we still have to be able to use IdeFrame as parent
+      if (!myMayBeParent && !(myWindow instanceof Frame)) {
         WindowManager.getInstance().doNotSuggestAsParent(myWindow);
       }
     }