From 264a9138d05d18bb58ab0b02a7406cc0f02ab8c5 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 30 Sep 2009 16:15:40 +0400 Subject: [PATCH 1/2] NavBar didn't appear on the second monitor --- .../src/com/intellij/ide/navigationToolbar/NavBarPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java index daba5ece836e..fc8898d08bd3 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java @@ -831,7 +831,8 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner { else { final Container container = focusedWindow != null ? focusedWindow : editor.getContentComponent(); final Point p = AbstractPopup.getCenterOf(container, this); - p.y = container.getHeight() / 4; + p.x -= container.getLocation().x; //make NavBar visible in case of two monitors; p should be relative + p.y = container.getHeight() / 4; HintManagerImpl.getInstanceImpl().showEditorHint(myHint, editor, p, HintManagerImpl.HIDE_BY_ESCAPE, 0, true); } select(); From 75464f066f03f892888e2c3e97d6f1b2ec45b153 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 30 Sep 2009 16:27:26 +0400 Subject: [PATCH 2/2] in headless mmode use EmptyProgressIndicator instead of BackgroundableProgressIndicator --- .../openapi/progress/impl/ProgressManagerImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java index 1e53c240ef2a..b1849259b94c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java @@ -289,9 +289,16 @@ public class ProgressManagerImpl extends ProgressManager { } public static void runProcessWithProgressAsynchronously(final Task.Backgroundable task) { - final BackgroundableProcessIndicator progressIndicator = new BackgroundableProcessIndicator(task); + final ProgressIndicator progressIndicator; + if (ApplicationManager.getApplication().isHeadlessEnvironment()) { + progressIndicator = new EmptyProgressIndicator(); + } + else { + final BackgroundableProcessIndicator indicator = new BackgroundableProcessIndicator(task); + Disposer.register(ApplicationManager.getApplication(), indicator); + progressIndicator = indicator; + } - Disposer.register(ApplicationManager.getApplication(), progressIndicator); final Runnable process = new TaskRunnable(task, progressIndicator);