Merge remote-tracking branch 'upstream/master' into feature/add-BalloonTipClicked-event-to-nofifyicon

Author: nkguo

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

@@ -34,8 +34,6 @@ public class NotifyIcon : FrameworkElement, IDisposable
 
     private IconHandle _iconHandle;
 
-    private const int WmTrayMouseMessage = InteropValues.WM_USER + 1024;
-
     private string _windowClassName;
 
     private int _wmTaskbarCreated;
@@ -494,7 +492,7 @@ private void UpdateIcon(bool showIconInTray, bool isTransparent = false)
             _isTransparent = isTransparent;
             var data = new InteropValues.NOTIFYICONDATA
             {
-                uCallbackMessage = WmTrayMouseMessage,
+                uCallbackMessage = InteropValues.WM_TRAYMOUSEMESSAGE,
                 uFlags = InteropValues.NIF_MESSAGE | InteropValues.NIF_ICON | InteropValues.NIF_TIP,
                 hWnd = _messageWindowHandle,
                 uID = _id,
@@ -578,7 +576,7 @@ private IntPtr Callback(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)
                     }
                     break;
                 case InteropValues.NIN_BALLOONUSERCLICK:
-                    RaiseEvent(new RoutedEventArgs(BalloonTipClickedEvent));
+                    RaiseEvent(new RoutedEventArgs(BalloonTipClickEvent));
                     break;
             }
         }
@@ -676,14 +674,14 @@ public event RoutedEventHandler MouseDoubleClick
         remove => RemoveHandler(MouseDoubleClickEvent, value);
     }
 
-    public static readonly RoutedEvent BalloonTipClickedEvent =
-    EventManager.RegisterRoutedEvent("BalloonTipClicked", RoutingStrategy.Bubble,
-        typeof(RoutedEventHandler), typeof(NotifyIcon));
+    public static readonly RoutedEvent BalloonTipClickEvent =
+        EventManager.RegisterRoutedEvent("BalloonTipClick", RoutingStrategy.Bubble, typeof(RoutedEventHandler),
+            typeof(NotifyIcon));
 
-    public event RoutedEventHandler BalloonTipClicked
+    public event RoutedEventHandler BalloonTipClick
     {
-        add => AddHandler(BalloonTipClickedEvent, value);
-        remove => RemoveHandler(BalloonTipClickedEvent, value);
+        add => AddHandler(BalloonTipClickEvent, value);
+        remove => RemoveHandler(BalloonTipClickEvent, value);
     }
 
     private void UpdateDataContext(FrameworkElement target, object oldValue, object newValue)

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

@@ -84,9 +84,11 @@ internal const int
         MF_BYPOSITION = 0x400,
         MF_GRAYED = 0x00000001,
         MF_SEPARATOR = 0x800,
+        NIN_BALLOONUSERCLICK = WM_USER + 5,
         TB_GETBUTTON = WM_USER + 23,
         TB_BUTTONCOUNT = WM_USER + 24,
         TB_GETITEMRECT = WM_USER + 29,
+        WM_TRAYMOUSEMESSAGE = WM_USER + 1024,
         VERTRES = 10,
         DESKTOPVERTRES = 117,
         LOGPIXELSX = 88,