From a42334d128eb919c6f29de6c7d51cd333b4221a0 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 6 Jul 2021 14:00:09 +0200
Subject: [PATCH] Hide child windows when hiding parent/owner.

---
 src/Avalonia.Controls/Window.cs               |  8 +++++
 .../WindowTests.cs                            | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index ddda083aa8..ae314a33ce 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -592,6 +592,14 @@ namespace Avalonia.Controls
                     owner.RemoveChild(this);
                 }
 
+                if (_children.Count > 0)
+                {
+                    foreach (var child in _children.ToArray())
+                    {
+                        child.child.Hide();
+                    }
+                }
+
                 Owner = null;
 
                 PlatformImpl?.Hide();
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 88c6c86c46..6b9921d83d 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -472,6 +472,42 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Hiding_Parent_Window_Should_Close_Children()
+        {
+            using (UnitTestApplication.Start(TestServices.MockWindowingPlatform))
+            {
+                var parent = new Window();
+                var child = new Window();
+
+                parent.Show();
+                child.Show(parent);
+
+                parent.Hide();
+
+                Assert.False(parent.IsVisible);
+                Assert.False(child.IsVisible);
+            }
+        }
+
+        [Fact]
+        public void Hiding_Parent_Window_Should_Close_Dialog_Children()
+        {
+            using (UnitTestApplication.Start(TestServices.MockWindowingPlatform))
+            {
+                var parent = new Window();
+                var child = new Window();
+
+                parent.Show();
+                child.ShowDialog(parent);
+
+                parent.Hide();
+
+                Assert.False(parent.IsVisible);
+                Assert.False(child.IsVisible);
+            }
+        }
+
         [Fact]
         public void Window_Should_Be_Centered_When_WindowStartupLocation_Is_CenterScreen()
         {