From 26e221e7f5fd613d918b4dd4ca24110f56ac19d7 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 8 Sep 2021 14:38:45 +0100
Subject: [PATCH] Win32 trayicon, make menu close when item is clicked.

---
 src/Windows/Avalonia.Win32/TrayIconImpl.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index 54337b57be..7f1f8763c0 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.LogicalTree;
 using Avalonia.Platform;
+using Avalonia.Styling;
 using Avalonia.Threading;
 using Avalonia.Win32.Interop;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
@@ -132,7 +134,7 @@ namespace Avalonia.Win32
                 SizeToContent = SizeToContent.WidthAndHeight,
                 Background = null,
                 TransparencyLevelHint = WindowTransparencyLevel.Transparent,
-                Content = new MenuFlyoutPresenter()
+                Content = new TrayIconMenuFlyoutPresenter()
                 {
                     Items = new List<MenuItem>
                                 {
@@ -161,6 +163,22 @@ namespace Avalonia.Win32
             WM_TRAYMOUSE = WindowsMessage.WM_USER + 1024
         }
 
+        class TrayIconMenuFlyoutPresenter : MenuFlyoutPresenter, IStyleable
+        {
+            Type IStyleable.StyleKey => typeof(MenuFlyoutPresenter);
+
+            public override void Close()
+            {
+                // DefaultMenuInteractionHandler calls this
+                var host = this.FindLogicalAncestorOfType<TrayPopupRoot>();
+                if (host != null)
+                {
+                    SelectedIndex = -1;
+                    host.Close();
+                }
+            }
+        }
+
         class TrayPopupRoot : Window
         {
             private ManagedPopupPositioner _positioner;