MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Alexey Kudravtsev
2009-09-30 17:08:59 +04:00
parent 858ff0950d 75464f066f
commit cb5b6761b7
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+2 -1
View File
@@ -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();
platform/platform-impl/src/com/intellij/openapi/progress/impl/ProgressManagerImpl.java
+9 -2
View File
@@ -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);