From 4c6ade16f258c2413633fd9b8a77532fd03fe1cc Mon Sep 17 00:00:00 2001
From: Denis Fokin <Denis.Fokin@jetbrains.com>
Date: Thu, 29 Sep 2016 18:46:43 +0300
Subject: [PATCH] Diff in the commit dialog does not honor z-order if
 per-project modality is enabled

---
 .../src/com/intellij/openapi/ui/FrameWrapper.java             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
index ddb0322dfe83..fdc470c6e2c4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
@@ -34,6 +34,7 @@ import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.WindowStateService;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.wm.*;
 import com.intellij.openapi.wm.ex.LayoutFocusTraversalPolicyExt;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
@@ -156,6 +157,9 @@ public class FrameWrapper implements Disposable, DataProvider {
       }
     };
     frame.addWindowListener(focusListener);
+    if (Registry.is("ide.perProjectModality")) {
+      frame.setAlwaysOnTop(true);
+    }
     Disposer.register(this, new Disposable() {
       @Override
       public void dispose() {