From 29eb0b7fe1b7b2995f6294a0deb17c16b103b21f Mon Sep 17 00:00:00 2001 From: Gregory Shrago Date: Thu, 19 Nov 2009 20:56:28 +0300 Subject: [PATCH] IDEADEV-41476 Edit HTML fragment: Vanished when resized --- platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java | 4 ++-- .../plugins/intelliLang/inject/quickedit/QuickEditAction.java | 3 ++- 2 files 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 b1a82a3cdf..9cb93a07d2 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -692,10 +692,10 @@ public class AbstractPopup implements JBPopup { Point point = (Point)e.getPoint().clone(); SwingUtilities.convertPointToScreen(point, e.getComponent()); - final Dimension dimension = myComponent.getSize(); + final Dimension dimension = myContent.getSize(); dimension.height += myResizable && isToDrawMacCorner() ? ourMacCorner.getHeight(myContent) : 4; dimension.width += 4; - Point locationOnScreen = myComponent.getLocationOnScreen(); + Point locationOnScreen = myContent.getLocationOnScreen(); final Rectangle bounds = new Rectangle(new Point(locationOnScreen.x - 2, locationOnScreen.y - 2), dimension); if (!bounds.contains(point)) { cancel(); diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java index 6646207805..d8f15f90a4 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java @@ -198,12 +198,13 @@ public class QuickEditAction implements IntentionAction { return Boolean.TRUE; } }); + builder.setModalContext(true); builder.setDimensionServiceKey(project, getClass().getSimpleName()+"DimensionKey", false); final JBPopup popup = builder.createPopup(); e.install(popup); - popup.showInBestPositionFor(editor); + popup.showCenteredInCurrentWindow(project); } public boolean startInWriteAction() { -- 2.11.4.GIT