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

IDEA-140925 diff: do not show modal dialog for diff from command line

Browse Source 
We use modal dialog to simplify managing of application life cycle,
when it is started via ApplicationStarter.main().

If we could find Project, we can rely on default behavior instead.
This commit is contained in:
Aleksey Pivovarov
2017-10-11 17:55:37 +03:00
parent 6fcf3f9046
commit 70ce590e37
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java
+3 -1
View File
@@ -61,6 +61,8 @@ public class DiffApplication extends DiffApplicationBase {
else {
request = DiffRequestFactory.getInstance().createFromFiles(project, files.get(0), files.get(1));
}
DiffManagerEx.getInstance().showDiffBuiltin(project, request, DiffDialogHints.MODAL);
DiffDialogHints dialogHints = project != null ? DiffDialogHints.DEFAULT : DiffDialogHints.MODAL;
DiffManagerEx.getInstance().showDiffBuiltin(project, request, dialogHints);
}
}