From c9b0b2d6703c32a5ae5bc7124fc51150e5de8a72 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Mon, 7 Oct 2024 09:49:13 +0800
Subject: [PATCH] Fix the issue of #170
---
...kbarIcon.ContextMenu.WinUI.SecondWindow.cs | 2 +
.../H.NotifyIcon/Interop/HwndUtilities.cs | 98 +++++++++++++++++++
src/libs/H.NotifyIcon/NativeMethods.txt | 1 +
3 files changed, 101 insertions(+)
create mode 100644 src/libs/H.NotifyIcon/Interop/HwndUtilities.cs
diff --git a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.ContextMenu.WinUI.SecondWindow.cs b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.ContextMenu.WinUI.SecondWindow.cs
index 44de719..ebe0e8c 100644
--- a/src/libs/H.NotifyIcon.Shared/TaskbarIcon.ContextMenu.WinUI.SecondWindow.cs
+++ b/src/libs/H.NotifyIcon.Shared/TaskbarIcon.ContextMenu.WinUI.SecondWindow.cs
@@ -137,6 +137,8 @@ private void PrepareContextMenuWindow()
frame.Loaded += (_, _) =>
{
+ // Set the window style to PopupWindow to make the title bar invisible
+ HwndUtilities.SetWindowStyle((nint)ContextMenuWindowHandle!, HwndUtilities.WindowStyle.PopupWindow);
flyout.ShowAt(window.Content, new FlyoutShowOptions
{
ShowMode = FlyoutShowMode.Transient,
diff --git a/src/libs/H.NotifyIcon/Interop/HwndUtilities.cs b/src/libs/H.NotifyIcon/Interop/HwndUtilities.cs
new file mode 100644
index 0000000..7a38a19
--- /dev/null
+++ b/src/libs/H.NotifyIcon/Interop/HwndUtilities.cs
@@ -0,0 +1,98 @@
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace H.NotifyIcon.Interop;
+
+///
+/// A set of HWND Helper Methods
+/// Codes are edited from: https://github.com/dotMorten/WinUIEx
+///
+public static class HwndUtilities
+{
+ ///
+ /// Sets the current window style
+ ///
+ /// Window handle
+ ///
+ [SupportedOSPlatform("windows10.0.16299.0")]
+ public static void SetWindowStyle(IntPtr hWnd, WindowStyle newStyle)
+ {
+ var h = new HWND(hWnd);
+ var currentStyle = PInvoke.GetWindowLong(h, WINDOW_LONG_PTR_INDEX.GWL_STYLE);
+ var r = PInvoke.SetWindowLong(h, WINDOW_LONG_PTR_INDEX.GWL_STYLE, (int)newStyle);
+ if (r != currentStyle)
+ Marshal.ThrowExceptionForHR(Marshal.GetLastWin32Error());
+ // Redraw window
+ _ = PInvoke.SetWindowPos(h, new HWND(IntPtr.Zero), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_FRAMECHANGED | SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER | SET_WINDOW_POS_FLAGS.SWP_NOOWNERZORDER);
+ }
+
+#pragma warning disable CA1069 // Enums values should not be duplicated
+ ///
+ /// Flags used for SetWindowStyle method
+ ///
+ public enum WindowStyle : int
+ {
+ /// The window has a thin-line border.
+ Border = 0x00800000,
+ /// The window has a title bar (includes the BORDER style).
+ Caption = 0x00C00000,
+ /// The window is a child window. A window with this style cannot have a menu bar. This style cannot be used with the POPUP style.
+ Child = 0x40000000,
+ /// Same as the style.
+ ChildWindow = 0x40000000,
+ /// Excludes the area occupied by child windows when drawing occurs within the parent window. This style is used when creating the parent window.
+ [Obsolete("Use ClipChildren")]
+ [EditorBrowsable(EditorBrowsableState.Never)]
+ ChildChildren = 0x02000000,
+ /// Excludes the area occupied by child windows when drawing occurs within the parent window. This style is used when creating the parent window.
+ ClipChildren = 0x02000000,
+ /// Clips child windows relative to each other; that is, when a particular child window receives a WM_PAINT message, the CLIPSIBLINGS style clips all other overlapping child windows out of the region of the child window to be updated. If CLIPSIBLINGS is not specified and child windows overlap, it is possible, when drawing within the client area of a child window, to draw within the client area of a neighboring child window.
+ ClipSiblings = 0x04000000,
+ /// The window is initially disabled. A disabled window cannot receive input from the user. To change this after a window has been created, use the EnableWindow function.
+ Disabled = 0x08000000,
+ /// The window has a border of a style typically used with dialog boxes. A window with this style cannot have a title bar.
+ DlgFrame = 0x00400000,
+ /// The window is the first control of a group of controls. The group consists of this first control and all controls defined after it, up to the next control with the GROUP style. The first control in each group usually has the TABSTOP style so that the user can move from group to group. The user can subsequently change the keyboard focus from one control in the group to the next control in the group by using the direction keys.
+ /// You can turn this style on and off to change dialog box navigation. To change this style after a window has been created, use the SetWindowLong function.
+ Group = 0x00020000,
+ /// The window has a horizontal scroll bar.
+ HScroll = 0x00100000,
+ /// The window is initially minimized. Same as the MINIMIZE style.
+ Iconic = 0x20000000,
+ /// The window is initially maximized.
+ Maximize = 0x01000000,
+ /// The window has a maximize button. Cannot be combined with the EX_CONTEXTHELP style. The SYSMENU style must also be specified.
+ MaximizeBox = 0x00010000,
+ /// The window is initially minimized. Same as the ICONIC style.
+ Minimize = 0x20000000,
+ /// The window has a minimize button. Cannot be combined with the EX_CONTEXTHELP style. The SYSMENU style must also be specified.
+ MinimizeBox = 0x00020000,
+ /// The window is an overlapped window. An overlapped window has a title bar and a border. Same as the TILED style.
+ Overlapped = 0x00000000,
+ /// The window is an overlapped window. Same as the TILEDWINDOW style.
+ OverlappedWindow = (Overlapped | Caption | SysMenu | ThickFrame | MinimizeBox | MaximizeBox),
+ /// The window is a pop-up window. This style cannot be used with the CHILD style.
+ Popup = unchecked((int)0x80000000),
+ /// The window is a pop-up window. The CAPTION and POPUPWINDOW styles must be combined to make the window menu visible.
+ PopupWindow = unchecked((int)(0x80000000 | Border | SysMenu)),
+ /// The window has a sizing border. Same as the THICKFRAME style.
+ SizeBox = 0x00040000,
+ /// The window has a window menu on its title bar. The CAPTION style must also be specified.
+ SysMenu = 0x00080000,
+ /// The window is a control that can receive the keyboard focus when the user presses the TAB key. Pressing the TAB key changes the keyboard focus to the next control with the TABSTOP style.
+ /// You can turn this style on and off to change dialog box navigation. To change this style after a window has been created, use the SetWindowLong function. For user-created windows and modeless dialogs to work with tab stops, alter the message loop to call the IsDialogMessage function.
+ TabStop = 0x00010000,
+ /// The window has a sizing border. Same as the SIZEBOX style.
+ ThickFrame = 0x00040000,
+ /// The window is an overlapped window. An overlapped window has a title bar and a border. Same as the OVERLAPPED style.
+ Tiled = 0x00000000,
+ /// The window is an overlapped window. Same as the OVERLAPPEDWINDOW style.
+ TiledWindow = (Overlapped | Caption | SysMenu | ThickFrame | MinimizeBox | MaximizeBox),
+ /// The window is initially visible.
+ /// This style can be turned on and off by using the ShowWindow or SetWindowPos function.
+ Visible = 0x10000000,
+ /// The window has a vertical scroll bar.
+ VScroll = 0x00200000,
+ }
+#pragma warning restore CA1069 // Enums values should not be duplicated
+}
diff --git a/src/libs/H.NotifyIcon/NativeMethods.txt b/src/libs/H.NotifyIcon/NativeMethods.txt
index 3519efe..65ebc5d 100644
--- a/src/libs/H.NotifyIcon/NativeMethods.txt
+++ b/src/libs/H.NotifyIcon/NativeMethods.txt
@@ -9,6 +9,7 @@ SetForegroundWindow
ShowWindow
SetWindowLong
GetWindowLong
+SetWindowPos
DefSubclassProc
SetWindowSubclass
GetClientRect