fix: setting NotifyIcon.TooltipText at runtime doesn't work

lepoco · Jun 14, 2024 · 9e2819d · 9e2819d
1 parent 09eeabd
commit 9e2819d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/src/Wpf.Ui.Tray/Controls/NotifyIcon.cs b/src/Wpf.Ui.Tray/Controls/NotifyIcon.cs
@@ -388,6 +388,8 @@ private static void OnTooltipTextChanged(DependencyObject d, DependencyPropertyC
         }
 
         notifyIcon.TooltipText = e.NewValue as string ?? string.Empty;
+        notifyIcon.internalNotifyIconManager.TooltipText = notifyIcon.TooltipText;
+        _ = notifyIcon.internalNotifyIconManager.ModifyToolTip();
     }
 
     private static void OnIconChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

diff --git a/src/Wpf.Ui.Tray/INotifyIcon.cs b/src/Wpf.Ui.Tray/INotifyIcon.cs
@@ -82,6 +82,11 @@ internal interface INotifyIcon
     /// </summary>
     bool ModifyIcon();
 
+    /// <summary>
+    /// Tries to modify the tooltip of the <see cref="INotifyIcon"/> in the shell.
+    /// </summary>
+    bool ModifyToolTip();
+
     /// <summary>
     /// Tries to remove the <see cref="INotifyIcon"/> from the shell.
     /// </summary>

diff --git a/src/Wpf.Ui.Tray/Internal/InternalNotifyIconManager.cs b/src/Wpf.Ui.Tray/Internal/InternalNotifyIconManager.cs
@@ -104,6 +104,12 @@ public virtual bool ModifyIcon()
         return TrayManager.ModifyIcon(this);
     }
 
+    /// <inheritdoc />
+    public virtual bool ModifyToolTip()
+    {
+        return TrayManager.ModifyToolTip(this);
+    }
+
     /// <inheritdoc />
     public virtual bool Unregister()
     {

diff --git a/src/Wpf.Ui.Tray/TrayManager.cs b/src/Wpf.Ui.Tray/TrayManager.cs
@@ -124,6 +124,19 @@ public static bool ModifyIcon(INotifyIcon notifyIcon)
         return Interop.Shell32.Shell_NotifyIcon(Interop.Shell32.NIM.MODIFY, notifyIcon.ShellIconData);
     }
 
+    public static bool ModifyToolTip(INotifyIcon notifyIcon)
+    {
+        if (!notifyIcon.IsRegistered)
+        {
+            return true;
+        }
+
+        notifyIcon.ShellIconData.szTip = notifyIcon.TooltipText;
+        notifyIcon.ShellIconData.uFlags |= Interop.Shell32.NIF.TIP;
+
+        return Interop.Shell32.Shell_NotifyIcon(Interop.Shell32.NIM.MODIFY, notifyIcon.ShellIconData);
+    }
+
     /// <summary>
     /// Tries to remove the <see cref="INotifyIcon"/> from the shell.
     /// </summary>