From 99fba05123ac9ba1991f767782c8785548fd3429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=A1=E6=9C=88?= <fullzoon@qq.com>
Date: Mon, 27 Apr 2026 19:32:25 +0800
Subject: [PATCH 1/2] fix(windows): Windows tray context menu can appear behind
 the taskbar after launching from Start Menu (#303)

---
 src/platform_impl/windows/mod.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/platform_impl/windows/mod.rs b/src/platform_impl/windows/mod.rs
index f42811c8..8d569216 100644
--- a/src/platform_impl/windows/mod.rs
+++ b/src/platform_impl/windows/mod.rs
@@ -18,13 +18,14 @@ use windows_sys::{
             },
             WindowsAndMessaging::{
                 ChangeWindowMessageFilterEx, CreateWindowExW, DefWindowProcW, DestroyWindow,
-                GetCursorPos, KillTimer, RegisterClassW, RegisterWindowMessageA, SendMessageW,
-                SetForegroundWindow, SetTimer, TrackPopupMenu, CREATESTRUCTW, CW_USEDEFAULT,
-                GWL_USERDATA, HICON, HMENU, MSGFLT_ALLOW, TPM_BOTTOMALIGN, TPM_LEFTALIGN,
-                WM_CREATE, WM_DESTROY, WM_LBUTTONDBLCLK, WM_LBUTTONDOWN, WM_LBUTTONUP,
-                WM_MBUTTONDBLCLK, WM_MBUTTONDOWN, WM_MBUTTONUP, WM_MOUSEMOVE, WM_NCCREATE,
-                WM_RBUTTONDBLCLK, WM_RBUTTONDOWN, WM_RBUTTONUP, WM_TIMER, WNDCLASSW, WS_EX_LAYERED,
-                WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT, WS_OVERLAPPED,
+                GetCursorPos, KillTimer, PostMessageW, RegisterClassW, RegisterWindowMessageA,
+                SendMessageW, SetForegroundWindow, SetTimer, TrackPopupMenu, CREATESTRUCTW,
+                CW_USEDEFAULT, GWL_USERDATA, HICON, HMENU, MSGFLT_ALLOW, TPM_BOTTOMALIGN,
+                TPM_LEFTALIGN, WM_CREATE, WM_DESTROY, WM_LBUTTONDBLCLK, WM_LBUTTONDOWN,
+                WM_LBUTTONUP, WM_MBUTTONDBLCLK, WM_MBUTTONDOWN, WM_MBUTTONUP, WM_MOUSEMOVE,
+                WM_NCCREATE, WM_NULL, WM_RBUTTONDBLCLK, WM_RBUTTONDOWN, WM_RBUTTONUP, WM_TIMER,
+                WNDCLASSW, WS_EX_LAYERED, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT,
+                WS_OVERLAPPED,
             },
         },
     },
@@ -487,8 +488,8 @@ unsafe extern "system" fn tray_proc(
 
             TrayIconEvent::send(event);
 
-            if (userdata.menu_on_right_click && lparam as u32 == WM_RBUTTONDOWN)
-                || (userdata.menu_on_left_click && lparam as u32 == WM_LBUTTONDOWN)
+            if (userdata.menu_on_right_click && lparam as u32 == WM_RBUTTONUP)
+                || (userdata.menu_on_left_click && lparam as u32 == WM_LBUTTONUP)
             {
                 if let Some(menu) = userdata.hpopupmenu {
                     show_tray_menu(hwnd, menu, cursor.x, cursor.y);
@@ -551,6 +552,9 @@ unsafe fn show_tray_menu(hwnd: HWND, menu: HMENU, x: i32, y: i32) {
         hwnd,
         std::ptr::null_mut(),
     );
+    // The shell docs recommend posting a benign message after TrackPopupMenu
+    // for notification area menus so the task switch is finalized correctly.
+    PostMessageW(hwnd, WM_NULL, 0, 0);
 }
 
 #[inline]

From a1cb0f0d6087cce5ed6745afde2f9ab2e76796f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=A1=E6=9C=88?= <fullzoon@qq.com>
Date: Thu, 30 Apr 2026 10:51:14 +0800
Subject: [PATCH 2/2] chore: add change file for windows tray menu fix

---
 .changes/windows-tray-menu-zorder.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changes/windows-tray-menu-zorder.md

diff --git a/.changes/windows-tray-menu-zorder.md b/.changes/windows-tray-menu-zorder.md
new file mode 100644
index 00000000..a80ed262
--- /dev/null
+++ b/.changes/windows-tray-menu-zorder.md
@@ -0,0 +1,5 @@
+---
+"tray-icon": patch
+---
+
+Fixed a Windows tray menu issue reported in #303 where the context menu could appear behind the taskbar after launching from the Start Menu by aligning the tray menu handling with the expected shell behavior, including showing the right-click menu on button release and posting `WM_NULL` after `TrackPopupMenu`.