Fix tray icon behaviour

Author: noraa-junker

src/RunnerV2/RunnerV2/Helpers/SettingsHelper.cs

@@ -18,9 +18,9 @@ namespace RunnerV2.Helpers
 {
     internal static class SettingsHelper
     {
+        private static readonly SettingsUtils _settingsUtils = new();
         private static Process? _process;
         private static TwoWayPipeMessageIPCManaged? _ipc;
-        private static SettingsUtils _settingsUtils = new();
 
         public static void OpenSettingsWindow(bool showOobeWindow = false, bool showScoobeWindow = false, bool showFlyout = false, Point? flyoutPosition = null, string? additionalArguments = null)
         {

src/RunnerV2/RunnerV2/Helpers/TrayIconManager.cs

@@ -32,6 +32,18 @@ internal static void StartTrayIcon()
             Shell_NotifyIcon(NIMADD, ref notifyicondata);
         }
 
+        internal static void StopTrayIcon()
+        {
+            NOTIFYICONDATA notifyicondata = new()
+            {
+                CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
+                HWnd = Runner.RunnerHwnd,
+                UId = 1,
+            };
+
+            Shell_NotifyIcon(NIMDELETE, ref notifyicondata);
+        }
+
         private enum TrayButton : uint
         {
             Settings = 1,

src/RunnerV2/RunnerV2/NativeMethods.cs

@@ -63,6 +63,7 @@ internal struct TokenElevation
         internal static partial bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
 
         internal const uint NIMADD = 0x00000000;
+        internal const uint NIMDELETE = 0x00000002;
 
         internal struct NOTIFYICONDATA
         {
@@ -130,6 +131,8 @@ internal enum WindowMessages : uint
             COMMAND = 0x0111,
             HOTKEY = 0x0312,
             ICON_NOTIFY = 0x0800,
+            WINDOWPOSCHANGING = 0x0046,
+            DESTROY = 0x0002,
         }
 
         [DllImport("user32.dll")]
@@ -138,6 +141,9 @@ internal enum WindowMessages : uint
         [LibraryImport("user32.dll", SetLastError = false)]
         internal static partial IntPtr DefWindowProcW(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
 
+        [LibraryImport("user32.dll", SetLastError = true)]
+        internal static partial uint RegisterWindowMessageW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
         [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
         internal static partial nint CreateWindowExW(
             uint dwExStyle,

src/RunnerV2/RunnerV2/Runner.cs

@@ -68,11 +68,14 @@ internal static bool Run(Action afterInitializationAction)
             }
 
             afterInitializationAction();
+
             MessageLoop();
 
             return true;
         }
 
+        private static readonly uint _taskbarCreatedMessage = RegisterWindowMessageW("TaskbarCreated");
+
         private static void MessageLoop()
         {
             while (true)
@@ -82,20 +85,7 @@ private static void MessageLoop()
                     TranslateMessage(ref msg);
                     DispatchMessageW(ref msg);
 
-                    switch (msg.Message)
-                    {
-                        case (uint)WindowMessages.HOTKEY:
-                            HotkeyManager.ProcessHotkey(msg.WParam);
-                            break;
-                        case (uint)WindowMessages.ICON_NOTIFY:
-                            TrayIconManager.ProcessTrayIconMessage(msg.LParam);
-                            break;
-                        case (uint)WindowMessages.COMMAND:
-                            TrayIconManager.ProcessTrayMenuCommand(msg.WParam);
-                            break;
-                        default:
-                            break;
-                    }
+                    HandleMessage(msg.HWnd, msg.Message, (nint)msg.WParam, (nint)msg.LParam);
                 }
             }
         }
@@ -172,7 +162,7 @@ private static void InitializeTrayWindow()
                 HInstance = hInstance,
                 LpszClassName = TrayWindowClassName,
                 Style = CSHREDRAW | CSVREDRAW,
-                LpfnWndProc = TrayIconWindowProc,
+                LpfnWndProc = HandleMessage,
                 HIcon = hIcon,
                 HbrBackground = IntPtr.Zero,
                 LpszMenuName = string.Empty,
@@ -203,9 +193,34 @@ private static void InitializeTrayWindow()
             }
         }
 
-        private static IntPtr TrayIconWindowProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        private static IntPtr HandleMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {
-            TrayIconManager.ProcessTrayIconMessage(lParam.ToInt64());
+            switch (msg)
+            {
+                case (uint)WindowMessages.HOTKEY:
+                    HotkeyManager.ProcessHotkey((nuint)wParam);
+                    break;
+                case (uint)WindowMessages.ICON_NOTIFY:
+                    TrayIconManager.ProcessTrayIconMessage(lParam);
+                    break;
+                case (uint)WindowMessages.COMMAND:
+                    TrayIconManager.ProcessTrayMenuCommand((nuint)wParam);
+                    break;
+                case (uint)WindowMessages.WINDOWPOSCHANGING:
+                    TrayIconManager.StartTrayIcon();
+                    break;
+                case (uint)WindowMessages.DESTROY:
+                    TrayIconManager.StopTrayIcon();
+                    break;
+                default:
+                    if (msg == _taskbarCreatedMessage)
+                    {
+                        TrayIconManager.StartTrayIcon();
+                    }
+
+                    break;
+            }
+
             return DefWindowProcW(hWnd, msg, wParam, lParam);
         }
     }