Implemented TrayIcon mouse right button event (#17383)

src/Avalonia.Base/Input/MouseEventArgs.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace Avalonia.Input;
+
+public class MouseEventArgs : EventArgs
+{
+    public Point Position { get; }
+    public MouseButton Button { get; }
+
+    public MouseEventArgs(Point position, MouseButton button)
+    {
+        Position = position;
+        Button = button;
+    }
+
+    public static MouseEventArgs Empty => new(new Point(), MouseButton.None);
+}

src/Avalonia.Controls/Platform/ITrayIconImpl.cs

@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls.Platform;
+using Avalonia.Input;
 using Avalonia.Metadata;
 
 namespace Avalonia.Platform
@@ -27,10 +28,8 @@ public interface ITrayIconImpl : IDisposable
         /// </summary>
         INativeMenuExporter? MenuExporter { get; }
 
-        /// <summary>
-        /// Gets or Sets the Action that is called when the TrayIcon is clicked.
-        /// </summary>
-        Action? OnClicked { get; set; }
+        event EventHandler<MouseEventArgs>? MouseLeftButtonDown;
+        event EventHandler<MouseEventArgs>? MouseRightButtonDown;
     }
 
     [Unstable]

src/Avalonia.FreeDesktop/DBusTrayIconImpl.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using Avalonia.Controls.Platform;
+using Avalonia.Input;
 using Avalonia.Logging;
 using Avalonia.Platform;
 using Avalonia.Threading;
@@ -32,7 +33,8 @@ internal class DBusTrayIconImpl : ITrayIconImpl
 
         public bool IsActive { get; private set; }
         public INativeMenuExporter? MenuExporter { get; }
-        public Action? OnClicked { get; set; }
+        public event EventHandler<MouseEventArgs>? MouseLeftButtonDown;
+        public event EventHandler<MouseEventArgs>? MouseRightButtonDown;
         public Func<IWindowIconImpl?, uint[]>? IconConverterDelegate { get; set; }
 
         public DBusTrayIconImpl()
@@ -118,7 +120,8 @@ private async void CreateTrayIcon()
 
             _statusNotifierItemDbusObj!.SetTitleAndTooltip(_tooltipText);
             _statusNotifierItemDbusObj.SetIcon(_icon);
-            _statusNotifierItemDbusObj.ActivationDelegate += OnClicked;
+            _statusNotifierItemDbusObj.ActivationDelegate += () => MouseLeftButtonDown?.Invoke(null, new MouseEventArgs(new Point(), MouseButton.Left));
+            _statusNotifierItemDbusObj.ContextMenuDelegate += () => MouseRightButtonDown?.Invoke(null, new MouseEventArgs(new Point(), MouseButton.Right));
         }
 
         private void DestroyTrayIcon()
@@ -224,8 +227,13 @@ public StatusNotifierItemDbusObj(Connection connection, ObjectPath dbusMenuPath)
         public override Connection Connection { get; }
 
         public event Action? ActivationDelegate;
+        public event Action? ContextMenuDelegate;
 
-        protected override ValueTask OnContextMenuAsync(int x, int y) => new();
+        protected override ValueTask OnContextMenuAsync(int x, int y)
+        {
+            ContextMenuDelegate?.Invoke();
+            return new ValueTask();
+        }
 
         protected override ValueTask OnActivateAsync(int x, int y)
         {

src/Avalonia.Native/TrayIconImpl.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using Avalonia.Controls.Platform;
+using Avalonia.Input;
 using Avalonia.Native.Interop;
 using Avalonia.Platform;
 
@@ -19,8 +20,6 @@ public TrayIconImpl(IAvaloniaNativeFactory factory)
             MenuExporter = new AvaloniaNativeMenuExporter(_native, factory);
         }
 
-        public Action? OnClicked { get; set; }
-
         public void Dispose()
         {
             _native.Dispose();
@@ -64,5 +63,7 @@ public void SetIsTemplateIcon(bool isTemplateIcon)
         }
 
         public INativeMenuExporter? MenuExporter { get; }
+        public event EventHandler<MouseEventArgs>? MouseLeftButtonDown;
+        public event EventHandler<MouseEventArgs>? MouseRightButtonDown;
     }
 }

src/Avalonia.X11/XEmbedTrayIconImpl.cs

@@ -1,5 +1,6 @@
 using System;
 using Avalonia.Controls.Platform;
+using Avalonia.Input;
 using Avalonia.Logging;
 using Avalonia.Platform;
 
@@ -42,6 +43,7 @@ public void SetIsVisible(bool visible)
         }
 
         public INativeMenuExporter MenuExporter { get; }
-        public Action OnClicked { get; set; }
+        public event EventHandler<MouseEventArgs>? MouseLeftButtonDown;
+        public event EventHandler<MouseEventArgs>? MouseRightButtonDown;
     }
 }

src/Windows/Avalonia.Win32/TrayIconImpl.cs

@@ -5,6 +5,7 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Primitives.PopupPositioning;
+using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Media.Imaging;
 using Avalonia.Metadata;
@@ -48,8 +49,9 @@ public TrayIconImpl()
 
             s_trayIcons.Add(_uniqueId, this);
         }
-
-        public Action? OnClicked { get; set; }
+
+        public event EventHandler<MouseEventArgs>? MouseLeftButtonDown;
+        public event EventHandler<MouseEventArgs>? MouseRightButtonDown;
 
         public INativeMenuExporter MenuExporter => _exporter;
 
@@ -192,14 +194,22 @@ private IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
         {
             if (msg == (uint)CustomWindowsMessage.WM_TRAYMOUSE)
             {
+                if (!GetCursorPos(out var cursorPoint))
+                {
+                    return IntPtr.Zero;
+                }
+
+                var position = new Point(cursorPoint.X, cursorPoint.Y);
+
                 // Determine the type of message and call the matching event handlers
                 switch (lParam.ToInt32())
                 {
                     case (int)WindowsMessage.WM_LBUTTONUP:
-                        OnClicked?.Invoke();
+                        MouseLeftButtonDown?.Invoke(null, new MouseEventArgs(position, MouseButton.Left));
                         break;
 
                     case (int)WindowsMessage.WM_RBUTTONUP:
+                        MouseRightButtonDown?.Invoke(null, new MouseEventArgs(position, MouseButton.Right));
                         OnRightClicked();
                         break;
                 }