Pass dialog flag to window impl Show.

Not doing anything with it yet.

src/Avalonia.Controls/Platform/IWindowBaseImpl.cs

@@ -7,7 +7,9 @@ namespace Avalonia.Platform
         /// <summary>
         /// Shows the window.
         /// </summary>
-        void Show(bool activate);
+        /// <param name="activate">Whether to activate the shown window.</param>
+        /// <param name="isDialog">Whether the window is being shown as a dialog.</param>
+        void Show(bool activate, bool isDialog);
 
         /// <summary>
         /// Hides the window.

src/Avalonia.Controls/Window.cs

@@ -671,7 +671,7 @@ namespace Avalonia.Controls
                 
                 SetWindowStartupLocation(Owner?.PlatformImpl);
                 
-                PlatformImpl?.Show(ShowActivated);
+                PlatformImpl?.Show(ShowActivated, false);
                 Renderer?.Start();                
             }
             OnOpened(EventArgs.Empty);
@@ -743,7 +743,7 @@ namespace Avalonia.Controls
                 
                 SetWindowStartupLocation(owner.PlatformImpl);
                 
-                PlatformImpl?.Show(ShowActivated);
+                PlatformImpl?.Show(ShowActivated, true);
 
                 Renderer?.Start();
 

src/Avalonia.Controls/WindowBase.cs

@@ -162,7 +162,7 @@ namespace Avalonia.Controls
                     LayoutManager.ExecuteInitialLayoutPass();
                     _hasExecutedInitialLayoutPass = true;
                 }
-                PlatformImpl?.Show(true);
+                PlatformImpl?.Show(true, false);
                 Renderer?.Start();
                 OnOpened(EventArgs.Empty);
             }

src/Avalonia.DesignerSupport/Remote/PreviewerWindowImpl.cs

@@ -20,7 +20,7 @@ namespace Avalonia.DesignerSupport.Remote
             ClientSize = new Size(1, 1);
         }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
         }
 
@@ -99,10 +99,6 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void ShowDialog(IWindowImpl parent)
-        {
-        }
-
         public void SetSystemDecorations(SystemDecorations enabled)
         {
         }

src/Avalonia.DesignerSupport/Remote/Stubs.cs

@@ -77,7 +77,7 @@ namespace Avalonia.DesignerSupport.Remote
         {
         }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
         }
 

src/Avalonia.Headless/HeadlessWindowImpl.cs

@@ -75,7 +75,7 @@ namespace Avalonia.Headless
         public Action Closed { get; set; }
         public IMouseDevice MouseDevice { get; }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
             if (activate)
                 Dispatcher.UIThread.Post(() => Activated?.Invoke(), DispatcherPriority.Input);
@@ -147,11 +147,6 @@ namespace Avalonia.Headless
 
         }
 
-        public void ShowDialog(IWindowImpl parent)
-        {
-            Show(true);
-        }
-
         public void SetSystemDecorations(bool enabled)
         {
 

src/Avalonia.Native/PopupImpl.cs

@@ -60,14 +60,14 @@ namespace Avalonia.Native
             }
         }
 
-        public override void Show(bool activate)
+        public override void Show(bool activate, bool isDialog)
         {
             var parent = _parent;
             while (parent is PopupImpl p) 
                 parent = p._parent;
             if (parent is WindowImpl w)
                 w.Native.TakeFocusFromChildren();
-            base.Show(false);
+            base.Show(false, isDialog);
         }
 
         public override IPopupImpl CreatePopup() => new PopupImpl(_factory, _opts, _glFeature, this);

src/Avalonia.Native/WindowImplBase.cs

@@ -351,7 +351,7 @@ namespace Avalonia.Native
         }
 
 
-        public virtual void Show(bool activate)
+        public virtual void Show(bool activate, bool isDialog)
         {
             _native.Show(activate.AsComBool());
         }

src/Avalonia.X11/X11Window.cs

@@ -808,7 +808,7 @@ namespace Avalonia.X11
                 XSetTransientForHint(_x11.Display, _handle, parent.Handle.Handle);
         }
 
-        public void Show(bool activate)
+        public void Show(bool activate, bool isDialog)
         {
             _wasMappedAtLeastOnce = true;
             XMapWindow(_x11.Display, _handle);

src/Windows/Avalonia.Win32/PopupImpl.cs

@@ -17,7 +17,7 @@ namespace Avalonia.Win32
         [ThreadStatic]
         private static IntPtr s_parentHandle;
 
-        public override void Show(bool activate)
+        public override void Show(bool activate, bool isDialog)
         {
             // Popups are always shown non-activated.
             UnmanagedMethods.ShowWindow(Handle.Handle, UnmanagedMethods.ShowWindowCommand.ShowNoActivate);

src/Windows/Avalonia.Win32/Win32Platform.cs

@@ -246,7 +246,7 @@ namespace Avalonia.Win32
         public IWindowImpl CreateEmbeddableWindow()
         {
             var embedded = new EmbeddedWindowImpl();
-            embedded.Show(true);
+            embedded.Show(true, false);
             return embedded;
         }
 

src/Windows/Avalonia.Win32/WindowImpl.cs

@@ -570,7 +570,7 @@ namespace Avalonia.Win32
             _shown = false;
         }
 
-        public virtual void Show(bool activate)
+        public virtual void Show(bool activate, bool isDialog)
         {
             SetParent(_parent);
             ShowWindow(_showWindowState, activate);
@@ -1120,7 +1120,7 @@ namespace Avalonia.Win32
                         SetParent(null);
 
                         if (shown)
-                            Show(activated);
+                            Show(activated, false);
                     }
                 }
                 else

tests/Avalonia.Controls.UnitTests/ContextMenuTests.cs

@@ -128,7 +128,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 var sut = new ContextMenu();
@@ -148,7 +148,7 @@ namespace Avalonia.Controls.UnitTests
                 _mouse.Click(target);
 
                 Assert.False(sut.IsOpen);
-                popupImpl.Verify(x => x.Show(true), Times.Once);
+                popupImpl.Verify(x => x.Show(true, false), Times.Once);
                 popupImpl.Verify(x => x.Hide(), Times.Once);
             }
         }
@@ -158,7 +158,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 var sut = new ContextMenu();
@@ -179,7 +179,7 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(sut.IsOpen);
                 popupImpl.Verify(x => x.Hide(), Times.Once);
-                popupImpl.Verify(x => x.Show(true), Times.Exactly(2));
+                popupImpl.Verify(x => x.Show(true, false), Times.Exactly(2));
             }
         }
         
@@ -226,7 +226,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
 
                 bool eventCalled = false;
                 var sut = new ContextMenu();
@@ -242,7 +242,7 @@ namespace Avalonia.Controls.UnitTests
 
                 Assert.True(eventCalled);
                 Assert.False(sut.IsOpen);
-                popupImpl.Verify(x => x.Show(true), Times.Never);
+                popupImpl.Verify(x => x.Show(true, false), Times.Never);
             }
         }
 
@@ -346,7 +346,7 @@ namespace Avalonia.Controls.UnitTests
         {
             using (Application())
             {
-                popupImpl.Setup(x => x.Show(true)).Verifiable();
+                popupImpl.Setup(x => x.Show(true, false)).Verifiable();
                 popupImpl.Setup(x => x.Hide()).Verifiable();
 
                 bool eventCalled = false;
@@ -370,7 +370,7 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(eventCalled);
                 Assert.True(sut.IsOpen);
 
-                popupImpl.Verify(x => x.Show(true), Times.Once());
+                popupImpl.Verify(x => x.Show(true, false), Times.Once());
                 popupImpl.Verify(x => x.Hide(), Times.Never);
             }
         }

tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs

@@ -137,7 +137,7 @@ namespace Avalonia.Controls.UnitTests
                 var target = new TestWindowBase(windowImpl.Object);
                 target.IsVisible = true;
 
-                windowImpl.Verify(x => x.Show(true));
+                windowImpl.Verify(x => x.Show(true, false));
             }
         }
 

tests/Avalonia.UnitTests/MockWindowingPlatform.cs

@@ -58,7 +58,7 @@ namespace Avalonia.UnitTests
                 windowImpl.Object.Resized?.Invoke(clientSize);
             });
 
-            windowImpl.Setup(x => x.Show(true)).Callback(() =>
+            windowImpl.Setup(x => x.Show(true, It.IsAny<bool>())).Callback(() =>
             {
                 windowImpl.Object.Activated?.Invoke();
             });