From fa7d810bbe225664ccb88f491d05c328977ae62e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 5 Mar 2016 15:50:53 +0100
Subject: [PATCH] Dispose of PopupRoot when detached from tree.

---
 src/Perspex.Controls/Primitives/Popup.cs     | 2 ++
 src/Perspex.Controls/Primitives/PopupRoot.cs | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Perspex.Controls/Primitives/Popup.cs b/src/Perspex.Controls/Primitives/Popup.cs
index b0fbca931b..8cf0ef23e3 100644
--- a/src/Perspex.Controls/Primitives/Popup.cs
+++ b/src/Perspex.Controls/Primitives/Popup.cs
@@ -231,6 +231,8 @@ namespace Perspex.Controls.Primitives
         protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             _topLevel = null;
+            _popupRoot?.Dispose();
+            _popupRoot = null;
         }
 
         /// <summary>
diff --git a/src/Perspex.Controls/Primitives/PopupRoot.cs b/src/Perspex.Controls/Primitives/PopupRoot.cs
index 9aca175028..a685f03071 100644
--- a/src/Perspex.Controls/Primitives/PopupRoot.cs
+++ b/src/Perspex.Controls/Primitives/PopupRoot.cs
@@ -15,7 +15,7 @@ namespace Perspex.Controls.Primitives
     /// <summary>
     /// The root window of a <see cref="Popup"/>.
     /// </summary>
-    public class PopupRoot : TopLevel, IInteractive, IHostedVisualTreeRoot
+    public class PopupRoot : TopLevel, IInteractive, IHostedVisualTreeRoot, IDisposable
     {
         private IDisposable _presenterSubscription;
 
@@ -64,6 +64,12 @@ namespace Perspex.Controls.Primitives
         /// </summary>
         IVisual IHostedVisualTreeRoot.Host => Parent;
 
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            this.PlatformImpl.Dispose();
+        }
+
         /// <summary>
         /// Hides the popup.
         /// </summary>