Second window refinements 2 (#227)

* fix(secondwindow): open WinUI context menu on first right-click

- show the second-window flyout directly from ShowContextMenuInSecondWindowMode

- guard flyout display behind IsContextMenuVisible during window activation

- require second-window content before attempting to show the flyout

* fix(secondwindow): place context menu outside taskbar work area

- pass a tray-sized exclusion rectangle to CalculatePopupWindowPosition

- include TPM_WORKAREA when calculating popup placement

- keep menu placement adjacent to the tray icon instead of overlapping the taskbar band

* feat(secondwindow): expose open event and support owner window linkage

- add SecondWindowContextMenuOpened event when the flyout opens

- add HwndUtilities.SetOwnerWindow for popup ownership via GWLP_HWNDPARENT

- link second-window popup ownership to the tray message window

Author: CodeRedPaul

src/libs/H.NotifyIcon.Shared/TaskbarIcon.ContextMenu.WinUI.SecondWindow.cs

@@ -15,6 +15,7 @@ public partial class TaskbarIcon
     private nint? ContextMenuWindowHandle { get; set; }
     private AppWindow? ContextMenuAppWindow { get; set; }
     private MenuFlyout? ContextMenuFlyout { get; set; }
+    public event EventHandler? SecondWindowContextMenuOpened;
 
 #pragma warning disable CA1822 // Mark members as static
     partial void OnContextMenuModeChanged(ContextMenuMode oldValue, ContextMenuMode newValue)
@@ -33,21 +34,57 @@ partial void OnContextMenuModeChanged(ContextMenuMode oldValue, ContextMenuMode
     private void ShowContextMenuInSecondWindowMode(System.Drawing.Point cursorPosition)
     {
         if (ContextMenuWindowHandle == null ||
-            ContextMenuFlyout == null)
+            ContextMenuFlyout == null ||
+            ContextMenuWindow?.Content == null)
         {
             return;
         }
 
         var size = MeasureFlyout(ContextMenuFlyout, new Size(10000.0, 10000.0));
+        var excludeRect = CreateTrayCursorExcludeRect(cursorPosition);
         var rectangle = CursorUtilities.CalculatePopupWindowPosition(
             cursorPosition.X,
             cursorPosition.Y,
             (int)size.Width,
-            (int)size.Height);
+            (int)size.Height,
+            excludeRect);
 
+        IsContextMenuVisible = true;
         ContextMenuAppWindow?.MoveAndResize(rectangle.ToRectInt32());
         _ = WindowUtilities.ShowWindow(ContextMenuWindowHandle.Value);
         _ = WindowUtilities.SetForegroundWindow(ContextMenuWindowHandle.Value);
+        ShowSecondWindowFlyout(ContextMenuFlyout, ContextMenuWindow.Content);
+    }
+
+    private static System.Drawing.Rectangle CreateTrayCursorExcludeRect(System.Drawing.Point cursorPosition)
+    {
+        // Native tray menus avoid overlapping the icon/taskbar affordance itself.
+        // Give CalculatePopupWindowPosition a small tray-sized exclusion box so it
+        // picks a position adjacent to the cursor instead of overlapping the taskbar.
+        const int width = 36;
+        const int height = 36;
+
+        return new System.Drawing.Rectangle(
+            x: cursorPosition.X - (width / 2),
+            y: cursorPosition.Y - (height / 2),
+            width: width,
+            height: height);
+    }
+
+    private static void ShowSecondWindowFlyout(MenuFlyout flyout, UIElement target)
+    {
+        if (!flyout.IsOpen)
+        {
+            flyout.ShowAt(target, new FlyoutShowOptions
+            {
+                ShowMode = FlyoutShowMode.Transient,
+            });
+        }
+    }
+
+    private void RaiseSecondWindowContextMenuOpened()
+    {
+        SecondWindowContextMenuOpened?.Invoke(this, EventArgs.Empty);
     }
 
     [DynamicDependency(DynamicallyAccessedMemberTypes.NonPublicConstructors, typeof(OverlappedPresenter))]
@@ -86,6 +123,13 @@ private void PrepareContextMenuWindow()
         DesktopWindowsManagerMethods.SetRoundedCorners(handle);
         WindowUtilities.MakeTransparent(handle);
 
+        if (TrayIcon.WindowHandle != 0)
+        {
+            // Keep the second-window popup in the tray icon's window family so it
+            // participates in the same z-order/activation stack as the tray host.
+            HwndUtilities.SetOwnerWindow(handle, TrayIcon.WindowHandle);
+        }
+
 #if !HAS_UNO
         var id = Win32Interop.GetWindowIdFromWindow(handle);
         var appWindow = AppWindow.GetFromWindowId(id);
@@ -104,6 +148,13 @@ private void PrepareContextMenuWindow()
             AreOpenCloseAnimationsEnabled = ContextFlyout.AreOpenCloseAnimationsEnabled,
             Placement = FlyoutPlacementMode.Full,
         };
+        flyout.Opened += (_, _) =>
+        {
+            if (IsContextMenuVisible)
+            {
+                RaiseSecondWindowContextMenuOpened();
+            }
+        };
         flyout.Closed += (_, _) =>
         {
             if (!flyout.AreOpenCloseAnimationsEnabled ||
@@ -168,11 +219,12 @@ private void PrepareContextMenuWindow()
                 return;
             }
 
-            IsContextMenuVisible = true;
-            flyout.ShowAt(window.Content, new FlyoutShowOptions
+            if (!IsContextMenuVisible)
             {
-                ShowMode = FlyoutShowMode.Transient,
-            });
+                return;
+            }
+
+            ShowSecondWindowFlyout(flyout, window.Content);
         };
 
         ContextMenuWindow = window;

src/libs/H.NotifyIcon/Core/CursorUtilities.cs

@@ -64,7 +64,9 @@ public static unsafe Rectangle CalculatePopupWindowPosition(
             cx = width,
             cy = height,
         };
-        var flags = TRACK_POPUP_MENU_FLAGS.TPM_BOTTOMALIGN;
+        var flags =
+            TRACK_POPUP_MENU_FLAGS.TPM_BOTTOMALIGN |
+            TRACK_POPUP_MENU_FLAGS.TPM_WORKAREA;
         var _excludeRect = new RECT
         {
             left = excludeRect?.Left ?? 0,

src/libs/H.NotifyIcon/Interop/HwndUtilities.cs

@@ -45,4 +45,47 @@ public static void SetWindowStyleAsPopupWindow(IntPtr hWnd)
     {
         SetWindowStyle(hWnd, WINDOW_STYLE.WS_POPUPWINDOW);
     }
+
+    /// <summary>
+    /// Sets the owner for a top-level popup window.
+    /// </summary>
+    /// <param name="hWnd">Window handle.</param>
+    /// <param name="ownerHWnd">Owner window handle.</param>
+    [SupportedOSPlatform("windows5.0")]
+    public static void SetOwnerWindow(IntPtr hWnd, IntPtr ownerHWnd)
+    {
+        var window = new HWND(hWnd);
+
+        // GWLP_HWNDPARENT is not exposed consistently across all projections we build against.
+        const WINDOW_LONG_PTR_INDEX ownerIndex = (WINDOW_LONG_PTR_INDEX)(-8);
+
+        Marshal.SetLastPInvokeError(0);
+        if (Environment.Is64BitProcess)
+        {
+            _ = PInvoke.SetWindowLongPtr(window, ownerIndex, ownerHWnd);
+        }
+        else
+        {
+            _ = PInvoke.SetWindowLong(window, ownerIndex, ownerHWnd.ToInt32());
+        }
+
+        var error = Marshal.GetLastPInvokeError();
+        if (error != 0)
+        {
+            throw new Win32Exception(error);
+        }
+
+        _ = PInvoke.SetWindowPos(
+            hWnd: window,
+            hWndInsertAfter: new HWND(IntPtr.Zero),
+            X: 0,
+            Y: 0,
+            cx: 0,
+            cy: 0,
+            uFlags: SET_WINDOW_POS_FLAGS.SWP_FRAMECHANGED |
+                    SET_WINDOW_POS_FLAGS.SWP_NOMOVE |
+                    SET_WINDOW_POS_FLAGS.SWP_NOSIZE |
+                    SET_WINDOW_POS_FLAGS.SWP_NOACTIVATE |
+                    SET_WINDOW_POS_FLAGS.SWP_NOZORDER);
+    }
 }