From 949b7f2d9427e3922e43721a03f1acc13b209680 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 19 Jul 2022 21:24:29 -0400
Subject: [PATCH 1/4] Call GetHicon only once when creation a windows icon

---
 src/Windows/Avalonia.Win32/IconImpl.cs      | 20 +++-----------------
 src/Windows/Avalonia.Win32/TrayIconImpl.cs  |  4 +++-
 src/Windows/Avalonia.Win32/Win32Platform.cs |  8 ++++++--
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/Windows/Avalonia.Win32/IconImpl.cs b/src/Windows/Avalonia.Win32/IconImpl.cs
index 8548801555..4d2b89b0cc 100644
--- a/src/Windows/Avalonia.Win32/IconImpl.cs
+++ b/src/Windows/Avalonia.Win32/IconImpl.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using Avalonia.Platform;
 
@@ -8,31 +7,18 @@ namespace Avalonia.Win32
 {
     class IconImpl : IWindowIconImpl
     {
-        private Bitmap bitmap;
-        private Icon icon;
-
-        public IconImpl(Bitmap bitmap)
-        {
-            this.bitmap = bitmap;
-        }
+        private readonly Icon icon;
 
         public IconImpl(Icon icon)
         {
             this.icon = icon;
         }
 
-        public IntPtr HIcon => icon?.Handle ?? bitmap.GetHicon();
+        public IntPtr HIcon => icon.Handle;
 
         public void Save(Stream outputStream)
         {
-            if (icon != null)
-            {
-                icon.Save(outputStream);
-            }
-            else
-            {
-                bitmap.Save(outputStream, ImageFormat.Png);
-            }
+            icon.Save(outputStream);
         }
     }
 }
diff --git a/src/Windows/Avalonia.Win32/TrayIconImpl.cs b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
index 4d537a16a4..346d6e5adb 100644
--- a/src/Windows/Avalonia.Win32/TrayIconImpl.cs
+++ b/src/Windows/Avalonia.Win32/TrayIconImpl.cs
@@ -18,6 +18,8 @@ namespace Avalonia.Win32
     [Unstable]
     public class TrayIconImpl : ITrayIconImpl
     {
+        private static readonly IntPtr s_emptyIcon = new System.Drawing.Bitmap(32, 32).GetHicon();
+        
         private readonly int _uniqueId;
         private static int s_nextUniqueId;
         private bool _iconAdded;
@@ -86,7 +88,7 @@ namespace Avalonia.Win32
                 uID = _uniqueId,
                 uFlags = NIF.TIP | NIF.MESSAGE,
                 uCallbackMessage = (int)CustomWindowsMessage.WM_TRAYMOUSE,
-                hIcon = _icon?.HIcon ?? new IconImpl(new System.Drawing.Bitmap(32, 32)).HIcon,
+                hIcon = _icon?.HIcon ?? s_emptyIcon,
                 szTip = _tooltipText ?? ""
             };
 
diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs
index 73ef50052c..2b8070fb04 100644
--- a/src/Windows/Avalonia.Win32/Win32Platform.cs
+++ b/src/Windows/Avalonia.Win32/Win32Platform.cs
@@ -359,7 +359,7 @@ namespace Avalonia.Win32
             using (var memoryStream = new MemoryStream())
             {
                 bitmap.Save(memoryStream);
-                return new IconImpl(new System.Drawing.Bitmap(memoryStream));
+                return CreateIconImpl(memoryStream);
             }
         }
 
@@ -367,11 +367,15 @@ namespace Avalonia.Win32
         {
             try
             {
+                // new Icon() will work only if stream is an "ico" file.
                 return new IconImpl(new System.Drawing.Icon(stream));
             }
             catch (ArgumentException)
             {
-                return new IconImpl(new System.Drawing.Bitmap(stream));
+                // Fallback to Bitmap creation and converting into a windows icon. 
+                using var icon = new System.Drawing.Bitmap(stream);
+                var hIcon = icon.GetHicon();
+                return new IconImpl(System.Drawing.Icon.FromHandle(hIcon));
             }
         }
 

From 62d1b4f3b69eb97460a0c3bc0999caff8ed16ecb Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 19 Jul 2022 23:25:37 -0400
Subject: [PATCH 2/4] Add missing IsEnabled binding

---
 src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml | 1 +
 src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
index 81bd8f39c5..3b0019eea1 100644
--- a/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Default/Controls/NativeMenuBar.xaml
@@ -14,6 +14,7 @@
         <Menu.Styles>
           <Style Selector="MenuItem">
             <Setter Property="Header" Value="{Binding Header}"/>
+            <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
             <Setter Property="InputGesture" Value="{Binding Gesture}"/>
             <Setter Property="Items" Value="{Binding Menu.Items}"/>
             <Setter Property="Command" Value="{Binding Command}"/>
diff --git a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
index d40ba0cc1d..bcdec6f61a 100644
--- a/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/NativeMenuBar.xaml
@@ -15,6 +15,7 @@
         <Menu.Styles>
           <Style x:CompileBindings="False" Selector="MenuItem">
             <Setter Property="Header" Value="{Binding Header}"/>
+            <Setter Property="IsEnabled" Value="{Binding IsEnabled}"/>
             <Setter Property="InputGesture" Value="{Binding Gesture}"/>
             <Setter Property="Items" Value="{Binding Menu.Items}"/>
             <Setter Property="Command" Value="{Binding Command}"/>

From 7bc11941fbae4a95d726dbfe57924e8415b5b5ed Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 19 Jul 2022 23:34:16 -0400
Subject: [PATCH 3/4] Use bindings in native menu exporter

---
 samples/ControlCatalog/App.xaml                  |  1 +
 .../Win32NativeToManagedMenuExporter.cs          | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index d0e1bd885e..fab4622303 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -43,6 +43,7 @@
                 <NativeMenuItemSeparator />
                 <NativeMenuItem Header="Option 3" ToggleType="CheckBox" IsChecked="True" Command="{Binding ToggleCommand}" />
                 <NativeMenuItem Icon="/Assets/test_icon.ico" Header="Restore Defaults" Command="{Binding ToggleCommand}" />
+                <NativeMenuItem Header="Disabled option" IsEnabled="False" />
               </NativeMenu>
             </NativeMenuItem>
             <NativeMenuItem Header="Exit" Command="{Binding ExitCommand}" />
diff --git a/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs b/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs
index da8357a6f1..2b8bf6f8bf 100644
--- a/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs
+++ b/src/Windows/Avalonia.Win32/Win32NativeToManagedMenuExporter.cs
@@ -1,7 +1,10 @@
 using System.Collections.Generic;
+using System.Reactive.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
+using Avalonia.Media.Imaging;
+using Avalonia.Utilities;
 
 #nullable enable
 
@@ -28,7 +31,16 @@ namespace Avalonia.Win32
                 }
                 else if (menuItem is NativeMenuItem item)
                 {
-                    var newItem = new MenuItem { Header = item.Header, Icon = item.Icon, Command = item.Command, CommandParameter = item.CommandParameter };
+                    var newItem = new MenuItem
+                    {
+                        [!MenuItem.HeaderProperty] = item.GetObservable(NativeMenuItem.HeaderProperty).ToBinding(),
+                        [!MenuItem.IconProperty] = item.GetObservable(NativeMenuItem.IconProperty)
+                            .Select(i => i is {} bitmap ? new Image { Source = bitmap } : null).ToBinding(),
+                        [!MenuItem.IsEnabledProperty] = item.GetObservable(NativeMenuItem.IsEnabledProperty).ToBinding(),
+                        [!MenuItem.CommandProperty] = item.GetObservable(NativeMenuItem.CommandProperty).ToBinding(),
+                        [!MenuItem.CommandParameterProperty] = item.GetObservable(NativeMenuItem.CommandParameterProperty).ToBinding(),
+                        [!MenuItem.InputGestureProperty] = item.GetObservable(NativeMenuItem.GestureProperty).ToBinding()
+                    };
 
                     if (item.Menu != null)
                     {
@@ -36,7 +48,7 @@ namespace Avalonia.Win32
                     }
                     else if (item.HasClickHandlers && item is INativeMenuItemExporterEventsImplBridge bridge)
                     {
-                        newItem.Click += (_, __) => bridge.RaiseClicked();
+                        newItem.Click += (_, _) => bridge.RaiseClicked();
                     }
 
                     result.Add(newItem);

From d1b932a8e0c63eac379c7a4f9e0b5aa164897b31 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 20 Jul 2022 01:14:57 -0400
Subject: [PATCH 4/4] Allow tray icon only on the Application

---
 src/Avalonia.Controls/TrayIcon.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/TrayIcon.cs b/src/Avalonia.Controls/TrayIcon.cs
index 20c8dff8ea..41a1abd838 100644
--- a/src/Avalonia.Controls/TrayIcon.cs
+++ b/src/Avalonia.Controls/TrayIcon.cs
@@ -61,6 +61,10 @@ namespace Avalonia.Controls
                         args.NewValue.Value.CollectionChanged += Icons_CollectionChanged;
                     }
                 }
+                else
+                {
+                    throw new InvalidOperationException("TrayIcon.Icons must be set on the Application.");
+                }
             });
 
             var app = Application.Current ?? throw new InvalidOperationException("Application not yet initialized.");
@@ -123,9 +127,9 @@ namespace Avalonia.Controls
         public static readonly StyledProperty<bool> IsVisibleProperty =
             Visual.IsVisibleProperty.AddOwner<TrayIcon>();
 
-        public static void SetIcons(AvaloniaObject o, TrayIcons trayIcons) => o.SetValue(IconsProperty, trayIcons);
+        public static void SetIcons(Application o, TrayIcons trayIcons) => o.SetValue(IconsProperty, trayIcons);
 
-        public static TrayIcons GetIcons(AvaloniaObject o) => o.GetValue(IconsProperty);
+        public static TrayIcons GetIcons(Application o) => o.GetValue(IconsProperty);
         
         /// <summary>
         /// Gets or sets the <see cref="Command"/> property of a TrayIcon.