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

[idea/community.git] / platform / platform-impl / src / com / intellij / ide / ui / LafManagerImpl.java

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
index c3c279f8631b88f8696619eaff8e06f0ada10124..8c491af6dda856136ba3adbf70f790fed15bf3ff 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
@@ -21,6 +21,7 @@ import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.ui.popup.util.PopupUtil;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.SystemInfo;
@@ -308,10 +309,8 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
     }
 
     popupWeight = popupWeight.trim();
-    final boolean heavyWeighPopup = HEAVY_WEIGHT_POPUP.equals(popupWeight);
 
     PopupFactory popupFactory;
-
     final PopupFactory oldFactory = PopupFactory.getSharedInstance();
     if (!(oldFactory instanceof OurPopupFactory)) {
       popupFactory = new OurPopupFactory() {
@@ -322,20 +321,17 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo
           int y
         ) throws IllegalArgumentException {
           final Point point = fixPopupLocation(contents, x, y);
-          try {
-            final Method method = PopupFactory.class.getDeclaredMethod("setPopupType", int.class);
-            method.setAccessible(true);
-            method.invoke(oldFactory, heavyWeighPopup ? 2 : 1);
 
-          }
-          catch (Throwable e) {
-            LOG.error(e);
+          final int popupType = PopupUtil.getPopupType(this);
+          if (popupType >= 0) {
+            PopupUtil.setPopupType(oldFactory, popupType);
           }
 
           return oldFactory.getPopup(owner, contents, point.x, point.y);
         }
       };
 
+      PopupUtil.setPopupType(popupFactory, HEAVY_WEIGHT_POPUP.equals(popupWeight) ? 2 : 1);
       PopupFactory.setSharedInstance(popupFactory);
     }