From 1800eefd5a09f1ceff35c133a09e88bb38896de2 Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan_clark@outlook.com>
Date: Sat, 27 Feb 2021 15:38:09 +0000
Subject: [PATCH] Amend how we hide via deactivation as the user may still want
 to call Hide explicitly while having IsLightDismissedEnabled set to false

---
 samples/NotificationFlyoutSample/SampleFlyout.xaml         | 3 ++-
 .../NotificationFlyout/NotificationFlyout.cs               | 7 ++++++-
 .../NotificationFlyout/NotificationFlyoutApplication.cs    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/samples/NotificationFlyoutSample/SampleFlyout.xaml b/samples/NotificationFlyoutSample/SampleFlyout.xaml
index e491829..66e4f9b 100644
--- a/samples/NotificationFlyoutSample/SampleFlyout.xaml
+++ b/samples/NotificationFlyoutSample/SampleFlyout.xaml
@@ -2,7 +2,8 @@
     x:Class="NotificationFlyoutSample.SampleFlyout"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls">
+    xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls"
+    IsLightDismissEnabled="False">
     <controls:NotificationFlyout.ContextFlyout>
         <MenuFlyout>
             <MenuFlyoutItem Click="OnCloseMenuFlyoutItemClick" Text="Close" />
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
index d46f3c7..4c0b67e 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
@@ -69,9 +69,14 @@ namespace TheXamlGuy.NotificationFlyout.Uwp.UI.Controls
                 PreparePopup();
             }
 
+            _popup.IsOpen = false;
+        }
+
+        internal void TryHide()
+        {
             if (IsLightDismissEnabled)
             {
-                _popup.IsOpen = false;
+                Hide();
             }
         }
 
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
index fbe4e6c..b1a82f3 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
@@ -126,7 +126,7 @@ namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
         private void OnNotificationFlyoutXamlHostDeactivated(object sender, EventArgs args)
         {
             if (Flyout == null) return;
-            Flyout.Hide();
+            Flyout.TryHide();
         }
 
         private void ShowFlyout()