From fb5ed2a4c41775d987f09c613acd41e1e903ea9c Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 28 Oct 2015 15:55:49 +0300 Subject: [PATCH] IDEA-76795 vcs: show background progress while loading committed change details --- .../com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java index daae39cd330c..4b0867aa4c50 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java @@ -33,10 +33,10 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; -import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; +import com.intellij.openapi.progress.impl.BackgroundableProcessIndicator; import com.intellij.openapi.progress.impl.CoreProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; @@ -717,8 +717,9 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper { } }; + // we can's use runProcessWithProgressAsynchronously(task) because then ModalityState.NON_MODAL would be used CoreProgressManager progressManager = (CoreProgressManager)ProgressManager.getInstance(); - progressManager.runProcessWithProgressAsynchronously(task, new EmptyProgressIndicator(), null, ModalityState.current()); + progressManager.runProcessWithProgressAsynchronously(task, new BackgroundableProcessIndicator(task), null, ModalityState.current()); } @Nullable