From 4addfa3db1b2f17f5a4ec7ceabbafa839c9880f1 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Mon, 23 Jul 2018 21:16:23 +0100 Subject: [PATCH] add implementation of mouse events. --- .../Avalonia.DotNetCoreRuntime.csproj | 1 + src/Avalonia.Windowing/Bindings/EventsLoop.cs | 11 ++++++++++- src/Avalonia.Windowing/WindowImpl.cs | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj index f80462e958..2c7d290ff6 100644 --- a/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj +++ b/src/Avalonia.DotNetCoreRuntime/Avalonia.DotNetCoreRuntime.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Avalonia.Windowing/Bindings/EventsLoop.cs b/src/Avalonia.Windowing/Bindings/EventsLoop.cs index 47141535f3..652c72c980 100644 --- a/src/Avalonia.Windowing/Bindings/EventsLoop.cs +++ b/src/Avalonia.Windowing/Bindings/EventsLoop.cs @@ -5,7 +5,16 @@ namespace Avalonia.Windowing.Bindings { public enum MouseEventType : int { - MouseMoved + LeaveWindow, + LeftButtonDown, + LeftButtonUp, + RightButtonDown, + RightButtonUp, + MiddleButtonDown, + MiddleButtonUp, + Move, + Wheel, + NonClientLeftButtonDown } [StructLayout(LayoutKind.Sequential)] diff --git a/src/Avalonia.Windowing/WindowImpl.cs b/src/Avalonia.Windowing/WindowImpl.cs index 8af95fb7da..a5801f4fc3 100644 --- a/src/Avalonia.Windowing/WindowImpl.cs +++ b/src/Avalonia.Windowing/WindowImpl.cs @@ -169,7 +169,7 @@ namespace Avalonia.Windowing public void OnMouseEvent(MouseEvent evt) { Dispatcher.UIThread.RunJobs(DispatcherPriority.Input); - Input(new RawMouseEventArgs(MouseDevice, (uint)Environment.TickCount, _inputRoot, RawMouseEventType.Move, new Point(evt.Position.X, evt.Position.Y), InputModifiers.None)); + Input(new RawMouseEventArgs(MouseDevice, (uint)Environment.TickCount, _inputRoot, (RawMouseEventType)evt.EventType, new Point(evt.Position.X, evt.Position.Y), InputModifiers.None)); } public void OnResizeEvent(ResizeEvent evt)