From 261a0f0c2319b9849a3a2f1ae70e4bd6d0b83a79 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 6 Oct 2021 13:39:17 +0100
Subject: [PATCH] fix tray icon closing.

---
 src/Windows/Avalonia.Win32/TrayIconImpl.cs | 25 ++--------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index fce56bcb21..e8fc00fb74 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -181,32 +181,16 @@ namespace Avalonia.Win32
                 _positioner = new ManagedPopupPositioner(new TrayIconManagedPopupPositionerPopupImplHelper(MoveResize));
                 Topmost = true;
 
-                Activated += TrayPopupRoot_Activated;
                 Deactivated += TrayPopupRoot_Deactivated;
 
-                LostFocus += TrayPopupRoot_LostFocus1;
-
                 ShowInTaskbar = false;
-            }
 
-            private void TrayPopupRoot_LostFocus1(object sender, Interactivity.RoutedEventArgs e)
-            {
-                Debug.WriteLine("TrayIcon - Lost Focus");
-            }
-
-            private void TrayPopupRoot_Activated(object sender, EventArgs e)
-            {
-                Debug.WriteLine("TrayIcon - Activated");
+                ShowActivated = true;
             }
 
             private void TrayPopupRoot_Deactivated(object sender, EventArgs e)
             {
-                Debug.WriteLine("TrayIcon - Deactivated");
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    Close();
-                });
+                Close();
             }
 
             private void MoveResize(PixelPoint position, Size size, double scaling)
@@ -215,11 +199,6 @@ namespace Avalonia.Win32
                 PlatformImpl.Resize(size, PlatformResizeReason.Layout);
             }
 
-            private void TrayPopupRoot_LostFocus(object sender, Interactivity.RoutedEventArgs e)
-            {
-                Close();
-            }
-
             protected override void ArrangeCore(Rect finalRect)
             {
                 base.ArrangeCore(finalRect);