From 63ac6b9135c19ad7a641136a03db07285a638911 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 24 Mar 2017 18:35:46 +0000 Subject: [PATCH] Show the Bookmarks popup in modal context Find the focused window, not the main IDE frame. Useful in diff invoked from the commit dialog. Follow-up to b5addab Relates to IDEA-169296 Issues found in IDEA-CR-19062 --- .../com/intellij/ide/bookmarks/actions/BookmarksAction.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java index 6d64b370ec7d..db35bdda80e4 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java @@ -32,7 +32,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.ToolWindowManager; -import com.intellij.openapi.wm.WindowManager; +import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.components.JBList; import com.intellij.ui.popup.util.DetailViewImpl; @@ -122,10 +122,10 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail final Point location = DimensionService.getInstance().getLocation(DIMENSION_SERVICE_KEY, project); if (location != null) { - popup.showInScreenCoordinates(WindowManager.getInstance().getFrame(project), location); + popup.showInScreenCoordinates(WindowManagerEx.getInstanceEx().getMostRecentFocusedWindow(), location); } else { - popup.showCenteredInCurrentWindow(project); + popup.showInBestPositionFor(e.getDataContext()); } list.getEmptyText().setText("No Bookmarks");