From a542d8753de026bd786c914b571c2a680a2ce77c Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 15 Jul 2020 13:33:20 -0300
Subject: [PATCH] ensure tooltips are closed when its parent detaches from
 visual tree.

---
 src/Avalonia.Controls/ToolTipService.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index d90729e8a5..569697304f 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -28,14 +28,22 @@ namespace Avalonia.Controls
             {
                 control.PointerEnter -= ControlPointerEnter;
                 control.PointerLeave -= ControlPointerLeave;
+                control.DetachedFromVisualTree -= ControlDetaching;
             }
 
             if (e.NewValue != null)
             {
                 control.PointerEnter += ControlPointerEnter;
                 control.PointerLeave += ControlPointerLeave;
+                control.DetachedFromVisualTree += ControlDetaching;
             }
         }
+        
+        private void ControlDetaching(object sender, VisualTreeAttachmentEventArgs e)
+        {
+            var control = (Control)sender;
+            Close(control);
+        }
 
         /// <summary>
         /// Called when the pointer enters a control with an attached tooltip.