simplified and moved back to regular icon

ibetitsmike · ibetitsmike · commit 9c08ce51b08a · 2025-05-06T22:09:14.000+02:00
diff --git a/App/App.xaml.cs b/App/App.xaml.cs
@@ -107,7 +107,6 @@ public async Task ExitApplication()
     {
         _logger.LogDebug("exiting app");
         _handleWindowClosed = false;
-        TitleBarIcon.DisposeIconsManager();
         Exit();
         var syncController = _services.GetRequiredService<ISyncSessionController>();
         await syncController.DisposeAsync();
diff --git a/App/Controls/PInvoke.cs b/App/Controls/PInvoke.cs
diff --git a/App/Controls/TitleBarIcon.cs b/App/Controls/TitleBarIcon.cs
@@ -9,67 +9,11 @@ namespace Coder.Desktop.App.Controls
 {
     public static class TitleBarIcon
     {
-        private static readonly Lazy<IconsManager> _iconsManager = new(() => new IconsManager());
-
         public static void SetTitlebarIcon(Window window)
         {
             var hwnd = WindowNative.GetWindowHandle(window);
-            var theme = window.Content is FrameworkElement fe
-             ? fe.ActualTheme
-             : ElementTheme.Default;
-            _iconsManager.Value.SetTitlebarIcon(hwnd, theme == ElementTheme.Dark);
-        }
-
-        public static void DisposeIconsManager()
-        {
-            _iconsManager.Value.Dispose();
-        }
-    }
-
-#pragma warning disable CsWinRT1028 // Class does not need to be partial, it's an SDK bug: 
-    public class IconsManager : IDisposable
-#pragma warning restore CsWinRT1028 // Class is not marked partial
-    {
-        private nint hIconDark; 
-        private nint hIconLight;
-        private const string iconPathDark = "Assets/coder_icon_32_dark.ico";
-        private const string iconPathLight = "Assets/coder_icon_32_light.ico";
-        public IconsManager() {
-            hIconDark = PInvoke.LoadImage(
-                IntPtr.Zero,
-                iconPathDark,
-                PInvoke.IMAGE_ICON,
-                0,
-                0,
-                PInvoke.LR_LOADFROMFILE
-            );
-            hIconLight = PInvoke.LoadImage(
-                IntPtr.Zero,
-                iconPathLight,
-                PInvoke.IMAGE_ICON,
-                0,
-                0,
-                PInvoke.LR_LOADFROMFILE
-            );
-        }
-
-        public void SetTitlebarIcon(nint windowHandle, bool isDarkTheme)
-        {
-            PInvoke.SendMessage(windowHandle, PInvoke.WM_SETICON, (IntPtr)PInvoke.ICON_SMALL, isDarkTheme ? hIconDark : hIconLight);
-            PInvoke.SendMessage(windowHandle, PInvoke.WM_SETICON, (IntPtr)PInvoke.ICON_BIG, isDarkTheme ? hIconLight : hIconDark);
-        }
-
-        public void Dispose()
-        {
-            if (hIconDark != IntPtr.Zero)
-            {
-                PInvoke.DestroyIcon(hIconDark);
-            }
-            if (hIconLight != IntPtr.Zero)
-            {
-                PInvoke.DestroyIcon(hIconLight);
-            }
-            GC.SuppressFinalize(this);
+            var windowId = Win32Interop.GetWindowIdFromWindow(hwnd);
+            AppWindow.GetFromWindowId(windowId).SetIcon("coder.ico");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,6 @@ public async Task ExitApplication()`
`107`	`107`	`{`
`108`	`108`	`_logger.LogDebug("exiting app");`
`109`	`109`	`_handleWindowClosed = false;`
`110`		`- TitleBarIcon.DisposeIconsManager();`
`111`	`110`	`Exit();`
`112`	`111`	`var syncController = _services.GetRequiredService<ISyncSessionController>();`
`113`	`112`	`await syncController.DisposeAsync();`