Fix #2780

External Dialogs not visible with MainWindow set to IgnoreTaskbarOnMaximize
MahApps · Jan 5, 2017 · 513b76c · 513b76c
1 parent ddf1864
commit 513b76c
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/MahApps.Metro/MahApps.Metro.Shared/Behaviours/BorderlessWindowBehavior.cs b/src/MahApps.Metro/MahApps.Metro.Shared/Behaviours/BorderlessWindowBehavior.cs
@@ -368,12 +368,15 @@ private void HandleMaximize()
                     var width = rect.Width;
                     var height = rect.Height;
 
-                    // Z-Order would only get refreshed/reflected if clicking the
-                    // the titlebar (as opposed to other parts of the external
-                    // window) unless I first set the window to HWND_BOTTOM then HWND_TOP before HWND_NOTOPMOST
-                    UnsafeNativeMethods.SetWindowPos(this.handle, Constants.HWND_BOTTOM, left, top, width, height, Constants.TOPMOST_FLAGS);
-                    UnsafeNativeMethods.SetWindowPos(this.handle, Constants.HWND_TOP, left, top, width, height, Constants.TOPMOST_FLAGS);
-                    UnsafeNativeMethods.SetWindowPos(this.handle, Constants.HWND_NOTOPMOST, left, top, width, height, Constants.TOPMOST_FLAGS);
+                    // #2780 Don't blindly set the Z-Order to HWWND_NOTOPMOST. If this window has an owner, set
+                    // the Z-Order to be after the owner. This keeps external dialogs appearing correctly above
+                    // their owner window even when owner window is maximized and ignoring taskbar.
+                    IntPtr hwndInsAfter = Constants.HWND_NOTOPMOST;
+                    if (this.AssociatedObject.Owner != null)
+                    {
+                        hwndInsAfter = new WindowInteropHelper(this.AssociatedObject.Owner).Handle;
+                    }
+                    UnsafeNativeMethods.SetWindowPos(this.handle, hwndInsAfter, left, top, width, height, 0x0040);
                 }
             }