From d69718ab61d75c5542449a436bca5202b33e8b3e Mon Sep 17 00:00:00 2001
From: Dariusz Komosinski <darek.komosinski@gmail.com>
Date: Sat, 23 May 2020 21:00:41 +0200
Subject: [PATCH 1/2] Reimplement new child window support.

---
 samples/ControlCatalog/Pages/DialogsPage.xaml |  2 +
 .../ControlCatalog/Pages/DialogsPage.xaml.cs  | 15 ++++
 src/Avalonia.Controls/Window.cs               | 84 ++++++++++++++++---
 3 files changed, 88 insertions(+), 13 deletions(-)

diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml b/samples/ControlCatalog/Pages/DialogsPage.xaml
index 0834e829d8..a0e82663bf 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml
@@ -11,5 +11,7 @@
       <Button Name="DecoratedWindowDialog">Decorated window (dialog)</Button>
       <Button Name="Dialog">Dialog</Button>
       <Button Name="DialogNoTaskbar">Dialog (No taskbar icon)</Button>
+      <Button Name="OwnedWindow">Owned window</Button>
+      <Button Name="OwnedWindowNoTaskbar">Owned window (No taskbar icon)</Button>
   </StackPanel>
 </UserControl>
diff --git a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
index dcb94a89e7..cf6c771e34 100644
--- a/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/DialogsPage.xaml.cs
@@ -93,6 +93,21 @@ namespace ControlCatalog.Pages
                 window.ShowInTaskbar = false;
                 window.ShowDialog(GetWindow());
             };
+            this.FindControl<Button>("OwnedWindow").Click += delegate
+            {
+                var window = CreateSampleWindow();
+
+                window.Show(GetWindow());
+            };
+
+            this.FindControl<Button>("OwnedWindowNoTaskbar").Click += delegate
+            {
+                var window = CreateSampleWindow();
+
+                window.ShowInTaskbar = false;
+
+                window.Show(GetWindow());
+            };
         }
 
         private Window CreateSampleWindow()
diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 474d845905..24e0e90417 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Controls
     /// </summary>
     public class Window : WindowBase, IStyleable, IFocusScope, ILayoutRoot
     {
-        private List<Window> _children = new List<Window>();
+        private readonly List<(Window child, bool isDialog)> _children = new List<(Window, bool)>();
 
         /// <summary>
         /// Defines the <see cref="SizeToContent"/> property.
@@ -376,7 +376,7 @@ namespace Avalonia.Controls
 
         private void CloseInternal()
         {
-            foreach (var child in _children.ToList())
+            foreach (var (child, _) in _children.ToList())
             {
                 // if we HandleClosing() before then there will be no children.
                 child.CloseInternal();
@@ -399,7 +399,7 @@ namespace Avalonia.Controls
         {
             bool canClose = true;
 
-            foreach (var child in _children.ToList())
+            foreach (var (child, _) in _children.ToList())
             {
                 if (!child.HandleClosing())
                 {
@@ -472,6 +472,27 @@ namespace Avalonia.Controls
         /// The window has already been closed.
         /// </exception>
         public override void Show()
+        {
+            ShowCore(null);
+        }
+
+        /// <summary>
+        /// Shows the window as a child of <paramref name="parent"/>.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">
+        /// The window has already been closed.
+        /// </exception>
+        public void Show(Window parent)
+        {
+            if (parent is null)
+            {
+                throw new ArgumentNullException(nameof(parent), "Showing a child window requires valid parent.");
+            }
+
+            ShowCore(parent);
+        }
+
+        private void ShowCore(Window parent)
         {
             if (PlatformImpl == null)
             {
@@ -483,7 +504,7 @@ namespace Avalonia.Controls
                 return;
             }
 
-            this.RaiseEvent(new RoutedEventArgs(WindowOpenedEvent));
+            RaiseEvent(new RoutedEventArgs(WindowOpenedEvent));
 
             EnsureInitialized();
             IsVisible = true;
@@ -504,6 +525,14 @@ namespace Avalonia.Controls
 
             using (BeginAutoSizing())
             {
+                if (parent != null)
+                {
+                    PlatformImpl?.SetParent(parent.PlatformImpl);
+                }
+                
+                Owner = parent;
+                parent?.AddChild(this, false);
+
                 PlatformImpl?.Show();
                 Renderer?.Start();
             }
@@ -571,9 +600,9 @@ namespace Avalonia.Controls
 
             using (BeginAutoSizing())
             {
-                PlatformImpl.SetParent(owner.PlatformImpl);
+                PlatformImpl?.SetParent(owner.PlatformImpl);
                 Owner = owner;
-                owner.AddChild(this);
+                owner.AddChild(this, true);
                 PlatformImpl?.Show();
 
                 Renderer?.Start();
@@ -598,28 +627,57 @@ namespace Avalonia.Controls
 
         private void UpdateEnabled()
         {
-            PlatformImpl.SetEnabled(_children.Count == 0);
+            bool isEnabled = true;
+
+            foreach (var (_, isDialog)  in _children)
+            {
+                if (isDialog)
+                {
+                    isEnabled = false;
+                    break;
+                }
+            }
+
+            PlatformImpl.SetEnabled(isEnabled);
         }
 
-        private void AddChild(Window window)
+        private void AddChild(Window window, bool isDialog)
         {
-            _children.Add(window);
+            _children.Add((window, isDialog));
             UpdateEnabled();
         }
 
         private void RemoveChild(Window window)
         {
-            _children.Remove(window);
+            for (int i = _children.Count - 1; i >= 0; i--)
+            {
+                var (child, _) = _children[i];
+
+                if (ReferenceEquals(child, window))
+                {
+                    _children.RemoveAt(i);
+                }
+            }
+
             UpdateEnabled();
         }
 
         private void OnGotInputWhenDisabled()
         {
-            var firstChild = _children.FirstOrDefault();
+            Window firstDialogChild = null;
+
+            foreach (var (child, isDialog)  in _children)
+            {
+                if (isDialog)
+                {
+                    firstDialogChild = child;
+                    break;
+                }
+            }
 
-            if (firstChild != null)
+            if (firstDialogChild != null)
             {
-                firstChild.OnGotInputWhenDisabled();
+                firstDialogChild.OnGotInputWhenDisabled();
             }
             else
             {

From a04e187fa09fd3255024e77183b43f484e101f40 Mon Sep 17 00:00:00 2001
From: Dariusz Komosinski <darek.komosinski@gmail.com>
Date: Sat, 23 May 2020 21:02:43 +0200
Subject: [PATCH 2/2] Extra parameter doc.

---
 src/Avalonia.Controls/Window.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 24e0e90417..782dc69b39 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -479,6 +479,7 @@ namespace Avalonia.Controls
         /// <summary>
         /// Shows the window as a child of <paramref name="parent"/>.
         /// </summary>
+        /// <param name="parent">Window that will be a parent of the shown window.</param>
         /// <exception cref="InvalidOperationException">
         /// The window has already been closed.
         /// </exception>