From f1f1be778bc729548e3331d7f222939d4ec8371e Mon Sep 17 00:00:00 2001
From: Gregor Klevze <gregor@klevze.si>
Date: Thu, 13 Aug 2026 16:38:12 +0200
Subject: [PATCH] Fix missing taskbar/Alt+Tab icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AppWindow.SetIcon(executablePath) was passing the .exe's own path, but that
API requires an actual .ico file path — passing an .exe silently does
nothing, so the window fell back to a generic placeholder icon in the
taskbar and Alt+Tab (the custom title bar icon fixed earlier is a separate,
XAML-drawn Image and was unaffected).

Embed branding/AmiReel.ico as a resource, extract it once to
%LOCALAPPDATA%\AmiReel\app-icon.ico on startup, and call
AppWindow.SetIcon() with that file path instead. Verified via WM_GETICON
against the running window's HWND that both the big and small icons now
resolve to the real AmiReel logo.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 AmiReel.csproj     |  4 ++++
 MainWindow.xaml.cs | 37 +++++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/AmiReel.csproj b/AmiReel.csproj
index 78d3d0b..596d6b2 100644
--- a/AmiReel.csproj
+++ b/AmiReel.csproj
@@ -51,6 +51,10 @@
          which a single-file self-contained publish bundles into the exe in a way that ms-appx://
          can no longer resolve at runtime — this embedded copy sidesteps that entirely. -->
     <EmbeddedResource Include="Assets\Square44x44Logo.scale-200.png" LogicalName="AmiReel.Assets.TitleBarIcon.png" />
+    <!-- Loaded at runtime and extracted to a real .ico file for AppWindow.SetIcon (MainWindow.xaml.cs),
+         which sets the taskbar/Alt+Tab window icon and requires an actual .ico file path — passing
+         the .exe path there does not work. Embedding it keeps this independent of publish mode too. -->
+    <EmbeddedResource Include="branding\AmiReel.ico" LogicalName="AmiReel.Assets.AppIcon.ico" />
   </ItemGroup>
 
   <!--
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index b7dedb5..dad9b19 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -34,10 +34,7 @@ public sealed partial class MainWindow : Window
         ExtendsContentIntoTitleBar = true;
         SetTitleBar(AppTitleBar);
 
-        string? executablePath = Environment.ProcessPath;
-        if (!string.IsNullOrWhiteSpace(executablePath) && File.Exists(executablePath))
-            AppWindow.SetIcon(executablePath);
-
+        SetWindowIcon();
         SetDefaultSizeAndPosition();
         LoadTitleBarIcon();
 
@@ -47,6 +44,38 @@ public sealed partial class MainWindow : Window
         AppWindow.Closing += AppWindow_Closing;
     }
 
+    /// <summary>
+    /// Sets the window's taskbar/Alt+Tab icon. <see cref="AppWindow.SetIcon(string)"/> requires an
+    /// actual .ico file path (an .exe path is silently ignored), so the embedded .ico is extracted
+    /// once to a stable file under %LOCALAPPDATA% and that path is used instead.
+    /// </summary>
+    private void SetWindowIcon()
+    {
+        try
+        {
+            string iconPath = Path.Combine(
+                Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                "AmiReel", "app-icon.ico");
+
+            if (!File.Exists(iconPath))
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(iconPath)!);
+                Assembly assembly = Assembly.GetExecutingAssembly();
+                using Stream? resource = assembly.GetManifestResourceStream("AmiReel.Assets.AppIcon.ico");
+                if (resource is null) return;
+
+                using FileStream file = File.Create(iconPath);
+                resource.CopyTo(file);
+            }
+
+            AppWindow.SetIcon(iconPath);
+        }
+        catch
+        {
+            // Non-critical: the window simply keeps whatever default icon Windows assigned.
+        }
+    }
+
     /// <summary>
     /// Loads the title bar icon from an embedded resource instead of an "ms-appx:///Assets/..."
     /// URI. A single-file self-contained publish bundles Content/Assets items into the exe in a