Fix some issues

Author: nkguo

src/Shared/HandyControlDemo_Shared/UserControl/Controls/NotifyIconDemo.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="HandyControlDemo.UserControl.NotifyIconDemo"
+<UserControl x:Class="HandyControlDemo.UserControl.NotifyIconDemo"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:langs="clr-namespace:HandyControlDemo.Properties.Langs"
@@ -54,6 +54,9 @@
                     <hc:EventTrigger EventName="MouseDoubleClick">
                         <hc:EventToCommand Command="{Binding MouseCmd}" CommandParameter="MouseDoubleClick"/>
                     </hc:EventTrigger>
+                    <hc:EventTrigger EventName="BalloonTipClicked">
+                        <hc:EventToCommand Command="hc:ControlCommands.PushMainWindow2Top"/>
+                    </hc:EventTrigger>
                 </hc:Interaction.Triggers>
             </hc:NotifyIcon>
             <hc:NotifyIcon Token="{x:Static data:MessageToken.NotifyIconContextDemo}" x:Name="NotifyIconContextContent" Text="HandyControl" IsBlink="{Binding ContextContentIsBlink}" Visibility="{Binding ContextContentIsShow,Converter={StaticResource Boolean2VisibilityConverter}}" Icon="/HandyControlDemo;component/Resources/Img/icon-white.ico">
@@ -75,6 +78,9 @@
                     <hc:EventTrigger EventName="MouseDoubleClick">
                         <hc:EventToCommand Command="{Binding MouseCmd}" CommandParameter="MouseDoubleClick"/>
                     </hc:EventTrigger>
+                    <hc:EventTrigger EventName="BalloonTipClicked">
+                        <hc:EventToCommand Command="hc:ControlCommands.PushMainWindow2Top"/>
+                    </hc:EventTrigger>
                 </hc:Interaction.Triggers>
             </hc:NotifyIcon>
         </hc:SimplePanel>

src/Shared/HandyControl_Shared/Controls/Other/NotifyIcon.cs

@@ -36,8 +36,6 @@ public class NotifyIcon : FrameworkElement, IDisposable
 
     private const int WmTrayMouseMessage = InteropValues.WM_USER + 1024;
 
-    private const int NIN_BALLOONUSERCLICK = InteropValues.WM_USER + 1025;
-
     private string _windowClassName;
 
     private int _wmTaskbarCreated;
@@ -152,11 +150,12 @@ public void ShowBalloonTip(string title, string content, NotifyIconInfoType info
 
         var data = new InteropValues.NOTIFYICONDATA
         {
-            uFlags = InteropValues.NIF_INFO,
+            uFlags = InteropValues.NIF_INFO | InteropValues.NIF_MESSAGE,
             hWnd = _messageWindowHandle,
             uID = _id,
             szInfoTitle = title ?? string.Empty,
-            szInfo = content ?? string.Empty
+            szInfo = content ?? string.Empty,
+            uCallbackMessage = WmTrayMouseMessage
         };
 
         data.dwInfoFlags = infoType switch
@@ -167,6 +166,7 @@ public void ShowBalloonTip(string title, string content, NotifyIconInfoType info
             NotifyIconInfoType.None => InteropValues.NIIF_NONE,
             _ => data.dwInfoFlags
         };
+        data.dwInfoFlags |= InteropValues.NIIF_USER;
 
         InteropMethods.Shell_NotifyIcon(InteropValues.NIM_MODIFY, data);
     }
@@ -577,7 +577,7 @@ private IntPtr Callback(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
                         _dispatcherTimerPos.Start();
                     }
                     break;
-                case NIN_BALLOONUSERCLICK:
+                case InteropValues.NIN_BALLOONUSERCLICK:
                     RaiseEvent(new RoutedEventArgs(BalloonTipClickedEvent));
                     break;
             }
@@ -677,12 +677,13 @@ public event RoutedEventHandler MouseDoubleClick
     }
 
     public static readonly RoutedEvent BalloonTipClickedEvent =
-    EventManager.RegisterRoutedEvent("BalloonTipClicked", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(NotifyIcon));
+    EventManager.RegisterRoutedEvent("BalloonTipClicked", RoutingStrategy.Bubble,
+        typeof(RoutedEventHandler), typeof(NotifyIcon));
 
     public event RoutedEventHandler BalloonTipClicked
     {
-        add { AddHandler(BalloonTipClickedEvent, value); }
-        remove { RemoveHandler(BalloonTipClickedEvent, value); }
+        add => AddHandler(BalloonTipClickedEvent, value);
+        remove => RemoveHandler(BalloonTipClickedEvent, value);
     }
 
     private void UpdateDataContext(FrameworkElement target, object oldValue, object newValue)

src/Shared/HandyControl_Shared/Tools/Interop/InteropValues.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -50,6 +50,7 @@ internal const int
         NIIF_INFO = 0x00000001,
         NIIF_WARNING = 0x00000002,
         NIIF_ERROR = 0x00000003,
+        NIIF_USER = 0x00000004,
         WM_ACTIVATE = 0x0006,
         WM_QUIT = 0x0012,
         WM_GETMINMAXINFO = 0x0024,
@@ -98,7 +99,8 @@ internal const int
         SC_RESTORE = 0xF120,
         SRCCOPY = 0x00CC0020,
         MONITOR_DEFAULTTOPRIMARY = 0x00000001,
-        MONITOR_DEFAULTTONEAREST = 0x00000002;
+        MONITOR_DEFAULTTONEAREST = 0x00000002,
+        NIN_BALLOONUSERCLICK = 0x0405;
 
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
     internal class NOTIFYICONDATA