From 6e1a56ea4ca8933108e96cddf96f529e8f0955ab Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Fri, 25 Mar 2016 19:27:03 +0100 Subject: [PATCH] Don't display tooltip for hidden control. If a control was hidden or removed between the time that the tooltip timer starts and the popup is shown, don't display the tooltip. Fixes #465. --- src/Perspex.Controls/ToolTip.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Perspex.Controls/ToolTip.cs b/src/Perspex.Controls/ToolTip.cs index 319a24f50b..6fd71a21b5 100644 --- a/src/Perspex.Controls/ToolTip.cs +++ b/src/Perspex.Controls/ToolTip.cs @@ -7,6 +7,7 @@ using System.Reactive.Subjects; using Perspex.Controls.Primitives; using Perspex.Input; using Perspex.Threading; +using Perspex.VisualTree; namespace Perspex.Controls { @@ -102,7 +103,7 @@ namespace Perspex.Controls /// The control. private static void ShowToolTip(Control control) { - if (control != null) + if (control != null && control.IsVisible && control.GetVisualRoot() != null) { if (s_popup == null) {