tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

PR comments

pull/2581/head
Nikita Tsukanov 7 years ago
parent
4351490e8a
commit
4c1f42b48a
22 changed files with 138 additions and 132 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
  2. 22
      src/Avalonia.Controls/Platform/InProcessDragSource.cs
  3. 4
      src/Avalonia.Controls/Primitives/Popup.cs
  4. 18
      src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
  5. 3
      src/Avalonia.Input/IMouseDevice.cs
  6. 6
      src/Avalonia.Input/IPointer.cs
  7. 6
      src/Avalonia.Input/IPointerDevice.cs
  8. 38
      src/Avalonia.Input/MouseDevice.cs
  9. 5
      src/Avalonia.Input/Pointer.cs
  10. 4
      src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
  11. 12
      src/Avalonia.Input/Raw/RawPointerEventArgs.cs
  12. 4
      src/Avalonia.Input/Raw/RawTouchEventArgs.cs
  13. 14
      src/Avalonia.Input/TouchDevice.cs
  14. 2
      src/Avalonia.Native/WindowImplBase.cs
  15. 26
      src/Avalonia.X11/X11Window.cs
  16. 20
      src/Avalonia.X11/XI2Manager.cs
  17. 18
      src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
  18. 18
      src/Linux/Avalonia.LinuxFramebuffer/Mice.cs
  19. 38
      src/Windows/Avalonia.Win32/WindowImpl.cs
  20. 2
      tests/Avalonia.Controls.UnitTests/MouseTestHelper.cs
  21. 2
      tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
  22. 4
      tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs

4
src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs
View File

@ -373,9 +373,9 @@ namespace Avalonia.Controls.Platform
protected internal virtual void RawInput(RawInputEventArgs e) protected internal virtual void RawInput(RawInputEventArgs e)
{ {
var mouse = e as RawMouseEventArgs; var mouse = e as RawPointerEventArgs;
if (mouse?.Type == RawMouseEventType.NonClientLeftButtonDown) if (mouse?.Type == RawPointerEventType.NonClientLeftButtonDown)
{ {
Menu.Close(); Menu.Close();
} }

22
src/Avalonia.Controls/Platform/InProcessDragSource.cs
View File

@ -43,7 +43,7 @@ namespace Avalonia.Platform
_lastPosition = default(Point); _lastPosition = default(Point);
_allowedEffects = allowedEffects; _allowedEffects = allowedEffects;
using (_inputManager.PreProcess.OfType<RawMouseEventArgs>().Subscribe(ProcessMouseEvents)) using (_inputManager.PreProcess.OfType<RawPointerEventArgs>().Subscribe(ProcessMouseEvents))
{ {
using (_inputManager.PreProcess.OfType<RawKeyEventArgs>().Subscribe(ProcessKeyEvents)) using (_inputManager.PreProcess.OfType<RawKeyEventArgs>().Subscribe(ProcessKeyEvents))
{ {
@ -153,7 +153,7 @@ namespace Avalonia.Platform
} }
} }
private void ProcessMouseEvents(RawMouseEventArgs e) private void ProcessMouseEvents(RawPointerEventArgs e)
{ {
if (!_initialInputModifiers.HasValue) if (!_initialInputModifiers.HasValue)
_initialInputModifiers = e.InputModifiers & MOUSE_INPUTMODIFIERS; _initialInputModifiers = e.InputModifiers & MOUSE_INPUTMODIFIERS;
@ -174,22 +174,22 @@ namespace Avalonia.Platform
switch (e.Type) switch (e.Type)
{ {
case RawMouseEventType.LeftButtonDown: case RawPointerEventType.LeftButtonDown:
case RawMouseEventType.RightButtonDown: case RawPointerEventType.RightButtonDown:
case RawMouseEventType.MiddleButtonDown: case RawPointerEventType.MiddleButtonDown:
case RawMouseEventType.NonClientLeftButtonDown: case RawPointerEventType.NonClientLeftButtonDown:
CancelDragging(); CancelDragging();
e.Handled = true; e.Handled = true;
return; return;
case RawMouseEventType.LeaveWindow: case RawPointerEventType.LeaveWindow:
RaiseEventAndUpdateCursor(RawDragEventType.DragLeave, e.Root, e.Position, e.InputModifiers); break; RaiseEventAndUpdateCursor(RawDragEventType.DragLeave, e.Root, e.Position, e.InputModifiers); break;
case RawMouseEventType.LeftButtonUp: case RawPointerEventType.LeftButtonUp:
CheckDraggingAccepted(InputModifiers.LeftMouseButton); break; CheckDraggingAccepted(InputModifiers.LeftMouseButton); break;
case RawMouseEventType.MiddleButtonUp: case RawPointerEventType.MiddleButtonUp:
CheckDraggingAccepted(InputModifiers.MiddleMouseButton); break; CheckDraggingAccepted(InputModifiers.MiddleMouseButton); break;
case RawMouseEventType.RightButtonUp: case RawPointerEventType.RightButtonUp:
CheckDraggingAccepted(InputModifiers.RightMouseButton); break; CheckDraggingAccepted(InputModifiers.RightMouseButton); break;
case RawMouseEventType.Move: case RawPointerEventType.Move:
var mods = e.InputModifiers & MOUSE_INPUTMODIFIERS; var mods = e.InputModifiers & MOUSE_INPUTMODIFIERS;
if (_initialInputModifiers.Value != mods) if (_initialInputModifiers.Value != mods)
{ {

4
src/Avalonia.Controls/Primitives/Popup.cs
View File

@ -421,9 +421,9 @@ namespace Avalonia.Controls.Primitives
private void ListenForNonClientClick(RawInputEventArgs e) private void ListenForNonClientClick(RawInputEventArgs e)
{ {
var mouse = e as RawMouseEventArgs; var mouse = e as RawPointerEventArgs;
if (!StaysOpen && mouse?.Type == RawMouseEventType.NonClientLeftButtonDown) if (!StaysOpen && mouse?.Type == RawPointerEventType.NonClientLeftButtonDown)
{ {
Close(); Close();
} }

18
src/Avalonia.Controls/Remote/Server/RemoteServerTopLevelImpl.cs
View File

@ -39,21 +39,21 @@ namespace Avalonia.Controls.Remote.Server
KeyboardDevice = AvaloniaLocator.Current.GetService<IKeyboardDevice>(); KeyboardDevice = AvaloniaLocator.Current.GetService<IKeyboardDevice>();
} }
private static RawMouseEventType GetAvaloniaEventType (Avalonia.Remote.Protocol.Input.MouseButton button, bool pressed) private static RawPointerEventType GetAvaloniaEventType (Avalonia.Remote.Protocol.Input.MouseButton button, bool pressed)
{ {
switch (button) switch (button)
{ {
case Avalonia.Remote.Protocol.Input.MouseButton.Left: case Avalonia.Remote.Protocol.Input.MouseButton.Left:
return pressed ? RawMouseEventType.LeftButtonDown : RawMouseEventType.LeftButtonUp; return pressed ? RawPointerEventType.LeftButtonDown : RawPointerEventType.LeftButtonUp;
case Avalonia.Remote.Protocol.Input.MouseButton.Middle: case Avalonia.Remote.Protocol.Input.MouseButton.Middle:
return pressed ? RawMouseEventType.MiddleButtonDown : RawMouseEventType.MiddleButtonUp; return pressed ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.MiddleButtonUp;
case Avalonia.Remote.Protocol.Input.MouseButton.Right: case Avalonia.Remote.Protocol.Input.MouseButton.Right:
return pressed ? RawMouseEventType.RightButtonDown : RawMouseEventType.RightButtonUp; return pressed ? RawPointerEventType.RightButtonDown : RawPointerEventType.RightButtonUp;
default: default:
return RawMouseEventType.Move; return RawPointerEventType.Move;
} }
} }
@ -166,11 +166,11 @@ namespace Avalonia.Controls.Remote.Server
{ {
Dispatcher.UIThread.Post(() => Dispatcher.UIThread.Post(() =>
{ {
Input?.Invoke(new RawMouseEventArgs( Input?.Invoke(new RawPointerEventArgs(
MouseDevice, MouseDevice,
0, 0,
InputRoot, InputRoot,
RawMouseEventType.Move, RawPointerEventType.Move,
new Point(pointer.X, pointer.Y), new Point(pointer.X, pointer.Y),
GetAvaloniaInputModifiers(pointer.Modifiers))); GetAvaloniaInputModifiers(pointer.Modifiers)));
}, DispatcherPriority.Input); }, DispatcherPriority.Input);
@ -179,7 +179,7 @@ namespace Avalonia.Controls.Remote.Server
{ {
Dispatcher.UIThread.Post(() => Dispatcher.UIThread.Post(() =>
{ {
Input?.Invoke(new RawMouseEventArgs( Input?.Invoke(new RawPointerEventArgs(
MouseDevice, MouseDevice,
0, 0,
InputRoot, InputRoot,
@ -192,7 +192,7 @@ namespace Avalonia.Controls.Remote.Server
{ {
Dispatcher.UIThread.Post(() => Dispatcher.UIThread.Post(() =>
{ {
Input?.Invoke(new RawMouseEventArgs( Input?.Invoke(new RawPointerEventArgs(
MouseDevice, MouseDevice,
0, 0,
InputRoot, InputRoot,

3
src/Avalonia.Input/IMouseDevice.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) The Avalonia Project. All rights reserved. // Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
namespace Avalonia.Input namespace Avalonia.Input
{ {
/// <summary> /// <summary>
@ -11,6 +13,7 @@ namespace Avalonia.Input
/// <summary> /// <summary>
/// Gets the mouse position, in screen coordinates. /// Gets the mouse position, in screen coordinates.
/// </summary> /// </summary>
[Obsolete("Use PointerEventArgs.GetPosition")]
PixelPoint Position { get; } PixelPoint Position { get; }
void SceneInvalidated(IInputRoot root, Rect rect); void SceneInvalidated(IInputRoot root, Rect rect);

6
src/Avalonia.Input/IPointer.cs
View File

@ -15,10 +15,4 @@ namespace Avalonia.Input
Mouse, Mouse,
Touch Touch
} }
public class PointerIds
{
private static int s_nextPointerId = 1000;
public static int Next() => s_nextPointerId++;
}
} }

6
src/Avalonia.Input/IPointerDevice.cs
View File

@ -1,16 +1,20 @@
// Copyright (c) The Avalonia Project. All rights reserved. // Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information. // Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
using Avalonia.VisualTree; using Avalonia.VisualTree;
namespace Avalonia.Input namespace Avalonia.Input
{ {
public interface IPointerDevice : IInputDevice public interface IPointerDevice : IInputDevice
{ {
[Obsolete("Use IPointer")]
IInputElement Captured { get; } IInputElement Captured { get; }
[Obsolete("Use IPointer")]
void Capture(IInputElement control); void Capture(IInputElement control);
[Obsolete("Use PointerEventArgs.GetPosition")]
Point GetPosition(IVisual relativeTo); Point GetPosition(IVisual relativeTo);
} }
} }

38
src/Avalonia.Input/MouseDevice.cs
View File

@ -24,7 +24,7 @@ namespace Avalonia.Input
PointerType IPointer.Type => PointerType.Mouse; PointerType IPointer.Type => PointerType.Mouse;
bool IPointer.IsPrimary => true; bool IPointer.IsPrimary => true;
int IPointer.Id { get; } = PointerIds.Next(); int IPointer.Id { get; } = Pointer.GetNextFreeId();
/// <summary> /// <summary>
/// Gets the control that is currently capturing by the mouse, if any. /// Gets the control that is currently capturing by the mouse, if any.
@ -100,7 +100,7 @@ namespace Avalonia.Input
public void ProcessRawEvent(RawInputEventArgs e) public void ProcessRawEvent(RawInputEventArgs e)
{ {
if (!e.Handled && e is RawMouseEventArgs margs) if (!e.Handled && e is RawPointerEventArgs margs)
ProcessRawEvent(margs); ProcessRawEvent(margs);
} }
@ -133,7 +133,7 @@ namespace Avalonia.Input
return rv; return rv;
} }
private void ProcessRawEvent(RawMouseEventArgs e) private void ProcessRawEvent(RawPointerEventArgs e)
{ {
Contract.Requires<ArgumentNullException>(e != null); Contract.Requires<ArgumentNullException>(e != null);
@ -143,30 +143,30 @@ namespace Avalonia.Input
var props = CreateProperties(e); var props = CreateProperties(e);
switch (e.Type) switch (e.Type)
{ {
case RawMouseEventType.LeaveWindow: case RawPointerEventType.LeaveWindow:
LeaveWindow(mouse, e.Root, e.InputModifiers); LeaveWindow(mouse, e.Root, e.InputModifiers);
break; break;
case RawMouseEventType.LeftButtonDown: case RawPointerEventType.LeftButtonDown:
case RawMouseEventType.RightButtonDown: case RawPointerEventType.RightButtonDown:
case RawMouseEventType.MiddleButtonDown: case RawPointerEventType.MiddleButtonDown:
if (ButtonCount(props) > 1) if (ButtonCount(props) > 1)
e.Handled = MouseMove(mouse, e.Root, e.Position, props, e.InputModifiers); e.Handled = MouseMove(mouse, e.Root, e.Position, props, e.InputModifiers);
else else
e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position, e.Handled = MouseDown(mouse, e.Timestamp, e.Root, e.Position,
props, e.InputModifiers); props, e.InputModifiers);
break; break;
case RawMouseEventType.LeftButtonUp: case RawPointerEventType.LeftButtonUp:
case RawMouseEventType.RightButtonUp: case RawPointerEventType.RightButtonUp:
case RawMouseEventType.MiddleButtonUp: case RawPointerEventType.MiddleButtonUp:
if (ButtonCount(props) != 0) if (ButtonCount(props) != 0)
e.Handled = MouseMove(mouse, e.Root, e.Position, props, e.InputModifiers); e.Handled = MouseMove(mouse, e.Root, e.Position, props, e.InputModifiers);
else else
e.Handled = MouseUp(mouse, e.Root, e.Position, props, e.InputModifiers); e.Handled = MouseUp(mouse, e.Root, e.Position, props, e.InputModifiers);
break; break;
case RawMouseEventType.Move: case RawPointerEventType.Move:
e.Handled = MouseMove(mouse, e.Root, e.Position, props, e.InputModifiers); e.Handled = MouseMove(mouse, e.Root, e.Position, props, e.InputModifiers);
break; break;
case RawMouseEventType.Wheel: case RawPointerEventType.Wheel:
e.Handled = MouseWheel(mouse, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, e.InputModifiers); e.Handled = MouseWheel(mouse, e.Root, e.Position, props, ((RawMouseWheelEventArgs)e).Delta, e.InputModifiers);
break; break;
} }
@ -181,21 +181,21 @@ namespace Avalonia.Input
} }
PointerPointProperties CreateProperties(RawMouseEventArgs args) PointerPointProperties CreateProperties(RawPointerEventArgs args)
{ {
var rv = new PointerPointProperties(args.InputModifiers); var rv = new PointerPointProperties(args.InputModifiers);
if (args.Type == RawMouseEventType.LeftButtonDown) if (args.Type == RawPointerEventType.LeftButtonDown)
rv.IsLeftButtonPressed = true; rv.IsLeftButtonPressed = true;
if (args.Type == RawMouseEventType.MiddleButtonDown) if (args.Type == RawPointerEventType.MiddleButtonDown)
rv.IsMiddleButtonPressed = true; rv.IsMiddleButtonPressed = true;
if (args.Type == RawMouseEventType.RightButtonDown) if (args.Type == RawPointerEventType.RightButtonDown)
rv.IsRightButtonPressed = true; rv.IsRightButtonPressed = true;
if (args.Type == RawMouseEventType.LeftButtonUp) if (args.Type == RawPointerEventType.LeftButtonUp)
rv.IsLeftButtonPressed = false; rv.IsLeftButtonPressed = false;
if (args.Type == RawMouseEventType.MiddleButtonUp) if (args.Type == RawPointerEventType.MiddleButtonUp)
rv.IsMiddleButtonPressed = false; rv.IsMiddleButtonPressed = false;
if (args.Type == RawMouseEventType.RightButtonDown) if (args.Type == RawPointerEventType.RightButtonDown)
rv.IsRightButtonPressed = false; rv.IsRightButtonPressed = false;
return rv; return rv;
} }

5
src/Avalonia.Input/Pointer.cs
View File

@ -6,6 +6,9 @@ namespace Avalonia.Input
{ {
public class Pointer : IPointer, IDisposable public class Pointer : IPointer, IDisposable
{ {
private static int s_NextFreePointerId = 1000;
public static int GetNextFreeId() => s_NextFreePointerId++;
public Pointer(int id, PointerType type, bool isPrimary, IInputElement implicitlyCaptured) public Pointer(int id, PointerType type, bool isPrimary, IInputElement implicitlyCaptured)
{ {
Id = id; Id = id;
@ -57,4 +60,4 @@ namespace Avalonia.Input
Captured.DetachedFromVisualTree -= OnCaptureDetached; Captured.DetachedFromVisualTree -= OnCaptureDetached;
} }
} }
} }

4
src/Avalonia.Input/Raw/RawMouseWheelEventArgs.cs
View File

@ -4,7 +4,7 @@
namespace Avalonia.Input.Raw namespace Avalonia.Input.Raw
{ {
public class RawMouseWheelEventArgs : RawMouseEventArgs public class RawMouseWheelEventArgs : RawPointerEventArgs
{ {
public RawMouseWheelEventArgs( public RawMouseWheelEventArgs(
IInputDevice device, IInputDevice device,
@ -12,7 +12,7 @@ namespace Avalonia.Input.Raw
IInputRoot root, IInputRoot root,
Point position, Point position,
Vector delta, InputModifiers inputModifiers) Vector delta, InputModifiers inputModifiers)
: base(device, timestamp, root, RawMouseEventType.Wheel, position, inputModifiers) : base(device, timestamp, root, RawPointerEventType.Wheel, position, inputModifiers)
{ {
Delta = delta; Delta = delta;
} }

12
src/Avalonia.Input/Raw/RawMouseEventArgs.cs → src/Avalonia.Input/Raw/RawPointerEventArgs.cs
View File

@ -5,7 +5,7 @@ using System;
namespace Avalonia.Input.Raw namespace Avalonia.Input.Raw
{ {
public enum RawMouseEventType public enum RawPointerEventType
{ {
LeaveWindow, LeaveWindow,
LeftButtonDown, LeftButtonDown,
@ -25,10 +25,10 @@ namespace Avalonia.Input.Raw
/// <summary> /// <summary>
/// A raw mouse event. /// A raw mouse event.
/// </summary> /// </summary>
public class RawMouseEventArgs : RawInputEventArgs public class RawPointerEventArgs : RawInputEventArgs
{ {
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="RawMouseEventArgs"/> class. /// Initializes a new instance of the <see cref="RawPointerEventArgs"/> class.
/// </summary> /// </summary>
/// <param name="device">The associated device.</param> /// <param name="device">The associated device.</param>
/// <param name="timestamp">The event timestamp.</param> /// <param name="timestamp">The event timestamp.</param>
@ -36,11 +36,11 @@ namespace Avalonia.Input.Raw
/// <param name="type">The type of the event.</param> /// <param name="type">The type of the event.</param>
/// <param name="position">The mouse position, in client DIPs.</param> /// <param name="position">The mouse position, in client DIPs.</param>
/// <param name="inputModifiers">The input modifiers.</param> /// <param name="inputModifiers">The input modifiers.</param>
public RawMouseEventArgs( public RawPointerEventArgs(
IInputDevice device, IInputDevice device,
ulong timestamp, ulong timestamp,
IInputRoot root, IInputRoot root,
RawMouseEventType type, RawPointerEventType type,
Point position, Point position,
InputModifiers inputModifiers) InputModifiers inputModifiers)
: base(device, timestamp) : base(device, timestamp)
@ -67,7 +67,7 @@ namespace Avalonia.Input.Raw
/// <summary> /// <summary>
/// Gets the type of the event. /// Gets the type of the event.
/// </summary> /// </summary>
public RawMouseEventType Type { get; private set; } public RawPointerEventType Type { get; private set; }
/// <summary> /// <summary>
/// Gets the input modifiers. /// Gets the input modifiers.

4
src/Avalonia.Input/Raw/RawTouchEventArgs.cs
View File

@ -1,9 +1,9 @@
namespace Avalonia.Input.Raw namespace Avalonia.Input.Raw
{ {
public class RawTouchEventArgs : RawMouseEventArgs public class RawTouchEventArgs : RawPointerEventArgs
{ {
public RawTouchEventArgs(IInputDevice device, ulong timestamp, IInputRoot root, public RawTouchEventArgs(IInputDevice device, ulong timestamp, IInputRoot root,
RawMouseEventType type, Point position, InputModifiers inputModifiers, RawPointerEventType type, Point position, InputModifiers inputModifiers,
long touchPointId) long touchPointId)
: base(device, timestamp, root, type, position, inputModifiers) : base(device, timestamp, root, type, position, inputModifiers)
{ {

14
src/Avalonia.Input/TouchDevice.cs
View File

@ -7,7 +7,9 @@ namespace Avalonia.Input
{ {
/// <summary> /// <summary>
/// Handles raw touch events /// Handles raw touch events
/// This class is supposed to be used on per-toplevel basis, don't event try to have a global instance /// <remarks>
/// This class is supposed to be used on per-toplevel basis, don't use a shared one
/// </remarks>
/// </summary> /// </summary>
public class TouchDevice : IInputDevice public class TouchDevice : IInputDevice
{ {
@ -28,17 +30,17 @@ namespace Avalonia.Input
var args = (RawTouchEventArgs)ev; var args = (RawTouchEventArgs)ev;
if (!_pointers.TryGetValue(args.TouchPointId, out var pointer)) if (!_pointers.TryGetValue(args.TouchPointId, out var pointer))
{ {
if (args.Type == RawMouseEventType.TouchEnd) if (args.Type == RawPointerEventType.TouchEnd)
return; return;
var hit = args.Root.InputHitTest(args.Position); var hit = args.Root.InputHitTest(args.Position);
_pointers[args.TouchPointId] = pointer = new Pointer(PointerIds.Next(), _pointers[args.TouchPointId] = pointer = new Pointer(Pointer.GetNextFreeId(),
PointerType.Touch, _pointers.Count == 0, hit); PointerType.Touch, _pointers.Count == 0, hit);
} }
var target = pointer.GetEffectiveCapture() ?? args.Root; var target = pointer.GetEffectiveCapture() ?? args.Root;
if (args.Type == RawMouseEventType.TouchBegin) if (args.Type == RawPointerEventType.TouchBegin)
{ {
var modifiers = GetModifiers(args.InputModifiers, pointer.IsPrimary); var modifiers = GetModifiers(args.InputModifiers, pointer.IsPrimary);
target.RaiseEvent(new PointerPressedEventArgs(target, pointer, target.RaiseEvent(new PointerPressedEventArgs(target, pointer,
@ -46,7 +48,7 @@ namespace Avalonia.Input
modifiers)); modifiers));
} }
if (args.Type == RawMouseEventType.TouchEnd) if (args.Type == RawPointerEventType.TouchEnd)
{ {
_pointers.Remove(args.TouchPointId); _pointers.Remove(args.TouchPointId);
var modifiers = GetModifiers(args.InputModifiers, false); var modifiers = GetModifiers(args.InputModifiers, false);
@ -58,7 +60,7 @@ namespace Avalonia.Input
} }
} }
if (args.Type == RawMouseEventType.TouchUpdate) if (args.Type == RawPointerEventType.TouchUpdate)
{ {
var modifiers = GetModifiers(args.InputModifiers, pointer.IsPrimary); var modifiers = GetModifiers(args.InputModifiers, pointer.IsPrimary);
target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, target, pointer, args.Root, target.RaiseEvent(new PointerEventArgs(InputElement.PointerMovedEvent, target, pointer, args.Root,

2
src/Avalonia.Native/WindowImplBase.cs
View File

@ -226,7 +226,7 @@ namespace Avalonia.Native
break; break;
default: default:
Input?.Invoke(new RawMouseEventArgs(_mouse, timeStamp, _inputRoot, (RawMouseEventType)type, point.ToAvaloniaPoint(), (InputModifiers)modifiers)); Input?.Invoke(new RawPointerEventArgs(_mouse, timeStamp, _inputRoot, (RawPointerEventType)type, point.ToAvaloniaPoint(), (InputModifiers)modifiers));
break; break;
} }
} }

26
src/Avalonia.X11/X11Window.cs
View File

@ -314,9 +314,9 @@ namespace Avalonia.X11
else if (ev.type == XEventName.FocusOut) else if (ev.type == XEventName.FocusOut)
Deactivated?.Invoke(); Deactivated?.Invoke();
else if (ev.type == XEventName.MotionNotify) else if (ev.type == XEventName.MotionNotify)
MouseEvent(RawMouseEventType.Move, ref ev, ev.MotionEvent.state); MouseEvent(RawPointerEventType.Move, ref ev, ev.MotionEvent.state);
else if (ev.type == XEventName.LeaveNotify) else if (ev.type == XEventName.LeaveNotify)
MouseEvent(RawMouseEventType.LeaveWindow, ref ev, ev.CrossingEvent.state); MouseEvent(RawPointerEventType.LeaveWindow, ref ev, ev.CrossingEvent.state);
else if (ev.type == XEventName.PropertyNotify) else if (ev.type == XEventName.PropertyNotify)
{ {
OnPropertyChange(ev.PropertyEvent.atom, ev.PropertyEvent.state == 0); OnPropertyChange(ev.PropertyEvent.atom, ev.PropertyEvent.state == 0);
@ -326,9 +326,9 @@ namespace Avalonia.X11
if (ActivateTransientChildIfNeeded()) if (ActivateTransientChildIfNeeded())
return; return;
if (ev.ButtonEvent.button < 4) if (ev.ButtonEvent.button < 4)
MouseEvent(ev.ButtonEvent.button == 1 ? RawMouseEventType.LeftButtonDown MouseEvent(ev.ButtonEvent.button == 1 ? RawPointerEventType.LeftButtonDown
: ev.ButtonEvent.button == 2 ? RawMouseEventType.MiddleButtonDown : ev.ButtonEvent.button == 2 ? RawPointerEventType.MiddleButtonDown
: RawMouseEventType.RightButtonDown, ref ev, ev.ButtonEvent.state); : RawPointerEventType.RightButtonDown, ref ev, ev.ButtonEvent.state);
else else
{ {
var delta = ev.ButtonEvent.button == 4 var delta = ev.ButtonEvent.button == 4
@ -347,9 +347,9 @@ namespace Avalonia.X11
else if (ev.type == XEventName.ButtonRelease) else if (ev.type == XEventName.ButtonRelease)
{ {
if (ev.ButtonEvent.button < 4) if (ev.ButtonEvent.button < 4)
MouseEvent(ev.ButtonEvent.button == 1 ? RawMouseEventType.LeftButtonUp MouseEvent(ev.ButtonEvent.button == 1 ? RawPointerEventType.LeftButtonUp
: ev.ButtonEvent.button == 2 ? RawMouseEventType.MiddleButtonUp : ev.ButtonEvent.button == 2 ? RawPointerEventType.MiddleButtonUp
: RawMouseEventType.RightButtonUp, ref ev, ev.ButtonEvent.state); : RawPointerEventType.RightButtonUp, ref ev, ev.ButtonEvent.state);
} }
else if (ev.type == XEventName.ConfigureNotify) else if (ev.type == XEventName.ConfigureNotify)
{ {
@ -577,7 +577,7 @@ namespace Avalonia.X11
public void ScheduleInput(RawInputEventArgs args) public void ScheduleInput(RawInputEventArgs args)
{ {
if (args is RawMouseEventArgs mouse) if (args is RawPointerEventArgs mouse)
mouse.Position = mouse.Position / Scaling; mouse.Position = mouse.Position / Scaling;
if (args is RawDragEvent drag) if (args is RawDragEvent drag)
drag.Location = drag.Location / Scaling; drag.Location = drag.Location / Scaling;
@ -598,13 +598,13 @@ namespace Avalonia.X11
} }
} }
void MouseEvent(RawMouseEventType type, ref XEvent ev, XModifierMask mods) void MouseEvent(RawPointerEventType type, ref XEvent ev, XModifierMask mods)
{ {
var mev = new RawMouseEventArgs( var mev = new RawPointerEventArgs(
_mouse, (ulong)ev.ButtonEvent.time.ToInt64(), _inputRoot, _mouse, (ulong)ev.ButtonEvent.time.ToInt64(), _inputRoot,
type, new Point(ev.ButtonEvent.x, ev.ButtonEvent.y), TranslateModifiers(mods)); type, new Point(ev.ButtonEvent.x, ev.ButtonEvent.y), TranslateModifiers(mods));
if(type == RawMouseEventType.Move && _inputQueue.Count>0 && _lastEvent.Event is RawMouseEventArgs ma) if(type == RawPointerEventType.Move && _inputQueue.Count>0 && _lastEvent.Event is RawPointerEventArgs ma)
if (ma.Type == RawMouseEventType.Move) if (ma.Type == RawPointerEventType.Move)
{ {
_lastEvent.Event = mev; _lastEvent.Event = mev;
return; return;

20
src/Avalonia.X11/XI2Manager.cs
View File

@ -182,10 +182,10 @@ namespace Avalonia.X11
|| ev.Type == XiEventType.XI_TouchEnd) || ev.Type == XiEventType.XI_TouchEnd)
{ {
var type = ev.Type == XiEventType.XI_TouchBegin ? var type = ev.Type == XiEventType.XI_TouchBegin ?
RawMouseEventType.TouchBegin : RawPointerEventType.TouchBegin :
(ev.Type == XiEventType.XI_TouchUpdate ? (ev.Type == XiEventType.XI_TouchUpdate ?
RawMouseEventType.TouchUpdate : RawPointerEventType.TouchUpdate :
RawMouseEventType.TouchEnd); RawPointerEventType.TouchEnd);
client.ScheduleInput(new RawTouchEventArgs(_touchDevice, client.ScheduleInput(new RawTouchEventArgs(_touchDevice,
ev.Timestamp, client.InputRoot, type, ev.Position, ev.Modifiers, ev.Detail)); ev.Timestamp, client.InputRoot, type, ev.Position, ev.Modifiers, ev.Detail));
return; return;
@ -223,20 +223,20 @@ namespace Avalonia.X11
client.ScheduleInput(new RawMouseWheelEventArgs(_platform.MouseDevice, ev.Timestamp, client.ScheduleInput(new RawMouseWheelEventArgs(_platform.MouseDevice, ev.Timestamp,
client.InputRoot, ev.Position, scrollDelta, ev.Modifiers)); client.InputRoot, ev.Position, scrollDelta, ev.Modifiers));
if (_pointerDevice.HasMotion(ev)) if (_pointerDevice.HasMotion(ev))
client.ScheduleInput(new RawMouseEventArgs(_platform.MouseDevice, ev.Timestamp, client.InputRoot, client.ScheduleInput(new RawPointerEventArgs(_platform.MouseDevice, ev.Timestamp, client.InputRoot,
RawMouseEventType.Move, ev.Position, ev.Modifiers)); RawPointerEventType.Move, ev.Position, ev.Modifiers));
} }
if (ev.Type == XiEventType.XI_ButtonPress || ev.Type == XiEventType.XI_ButtonRelease) if (ev.Type == XiEventType.XI_ButtonPress || ev.Type == XiEventType.XI_ButtonRelease)
{ {
var down = ev.Type == XiEventType.XI_ButtonPress; var down = ev.Type == XiEventType.XI_ButtonPress;
var type = var type =
ev.Button == 1 ? (down ? RawMouseEventType.LeftButtonDown : RawMouseEventType.LeftButtonUp) ev.Button == 1 ? (down ? RawPointerEventType.LeftButtonDown : RawPointerEventType.LeftButtonUp)
: ev.Button == 2 ? (down ? RawMouseEventType.MiddleButtonDown : RawMouseEventType.MiddleButtonUp) : ev.Button == 2 ? (down ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.MiddleButtonUp)
: ev.Button == 3 ? (down ? RawMouseEventType.RightButtonDown : RawMouseEventType.RightButtonUp) : ev.Button == 3 ? (down ? RawPointerEventType.RightButtonDown : RawPointerEventType.RightButtonUp)
: (RawMouseEventType?)null; : (RawPointerEventType?)null;
if (type.HasValue) if (type.HasValue)
client.ScheduleInput(new RawMouseEventArgs(_platform.MouseDevice, ev.Timestamp, client.InputRoot, client.ScheduleInput(new RawPointerEventArgs(_platform.MouseDevice, ev.Timestamp, client.InputRoot,
type.Value, ev.Position, ev.Modifiers)); type.Value, ev.Position, ev.Modifiers));
} }

18
src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs
View File

@ -145,17 +145,17 @@ namespace Avalonia.Gtk3
private unsafe bool OnButton(IntPtr w, IntPtr ev, IntPtr userdata) private unsafe bool OnButton(IntPtr w, IntPtr ev, IntPtr userdata)
{ {
var evnt = (GdkEventButton*)ev; var evnt = (GdkEventButton*)ev;
var e = new RawMouseEventArgs( var e = new RawPointerEventArgs(
Gtk3Platform.Mouse, Gtk3Platform.Mouse,
evnt->time, evnt->time,
_inputRoot, _inputRoot,
evnt->type == GdkEventType.ButtonRelease evnt->type == GdkEventType.ButtonRelease
? evnt->button == 1 ? evnt->button == 1
? RawMouseEventType.LeftButtonUp ? RawPointerEventType.LeftButtonUp
: evnt->button == 3 ? RawMouseEventType.RightButtonUp : RawMouseEventType.MiddleButtonUp : evnt->button == 3 ? RawPointerEventType.RightButtonUp : RawPointerEventType.MiddleButtonUp
: evnt->button == 1 : evnt->button == 1
? RawMouseEventType.LeftButtonDown ? RawPointerEventType.LeftButtonDown
: evnt->button == 3 ? RawMouseEventType.RightButtonDown : RawMouseEventType.MiddleButtonDown, : evnt->button == 3 ? RawPointerEventType.RightButtonDown : RawPointerEventType.MiddleButtonDown,
new Point(evnt->x, evnt->y), GetModifierKeys(evnt->state)); new Point(evnt->x, evnt->y), GetModifierKeys(evnt->state));
OnInput(e); OnInput(e);
return true; return true;
@ -179,11 +179,11 @@ namespace Avalonia.Gtk3
var evnt = (GdkEventMotion*)ev; var evnt = (GdkEventMotion*)ev;
var position = new Point(evnt->x, evnt->y); var position = new Point(evnt->x, evnt->y);
Native.GdkEventRequestMotions(ev); Native.GdkEventRequestMotions(ev);
var e = new RawMouseEventArgs( var e = new RawPointerEventArgs(
Gtk3Platform.Mouse, Gtk3Platform.Mouse,
evnt->time, evnt->time,
_inputRoot, _inputRoot,
RawMouseEventType.Move, RawPointerEventType.Move,
position, GetModifierKeys(evnt->state)); position, GetModifierKeys(evnt->state));
OnInput(e); OnInput(e);
@ -237,10 +237,10 @@ namespace Avalonia.Gtk3
{ {
var evnt = (GdkEventCrossing*) pev; var evnt = (GdkEventCrossing*) pev;
var position = new Point(evnt->x, evnt->y); var position = new Point(evnt->x, evnt->y);
OnInput(new RawMouseEventArgs(Gtk3Platform.Mouse, OnInput(new RawPointerEventArgs(Gtk3Platform.Mouse,
evnt->time, evnt->time,
_inputRoot, _inputRoot,
RawMouseEventType.Move, RawPointerEventType.Move,
position, GetModifierKeys(evnt->state))); position, GetModifierKeys(evnt->state)));
return true; return true;
} }

18
src/Linux/Avalonia.LinuxFramebuffer/Mice.cs
View File

@ -76,9 +76,9 @@ namespace Avalonia.LinuxFramebuffer
_y = Math.Min(_height, Math.Max(0, _y + ev.value)); _y = Math.Min(_height, Math.Max(0, _y + ev.value));
else else
return; return;
Event?.Invoke(new RawMouseEventArgs(LinuxFramebufferPlatform.MouseDevice, Event?.Invoke(new RawPointerEventArgs(LinuxFramebufferPlatform.MouseDevice,
LinuxFramebufferPlatform.Timestamp, LinuxFramebufferPlatform.Timestamp,
LinuxFramebufferPlatform.TopLevel.InputRoot, RawMouseEventType.Move, new Point(_x, _y), LinuxFramebufferPlatform.TopLevel.InputRoot, RawPointerEventType.Move, new Point(_x, _y),
InputModifiers.None)); InputModifiers.None));
} }
if (ev.type ==(int) EvType.EV_ABS) if (ev.type ==(int) EvType.EV_ABS)
@ -89,24 +89,24 @@ namespace Avalonia.LinuxFramebuffer
_y = TranslateAxis(device.AbsY.Value, ev.value, _height); _y = TranslateAxis(device.AbsY.Value, ev.value, _height);
else else
return; return;
Event?.Invoke(new RawMouseEventArgs(LinuxFramebufferPlatform.MouseDevice, Event?.Invoke(new RawPointerEventArgs(LinuxFramebufferPlatform.MouseDevice,
LinuxFramebufferPlatform.Timestamp, LinuxFramebufferPlatform.Timestamp,
LinuxFramebufferPlatform.TopLevel.InputRoot, RawMouseEventType.Move, new Point(_x, _y), LinuxFramebufferPlatform.TopLevel.InputRoot, RawPointerEventType.Move, new Point(_x, _y),
InputModifiers.None)); InputModifiers.None));
} }
if (ev.type == (short) EvType.EV_KEY) if (ev.type == (short) EvType.EV_KEY)
{ {
RawMouseEventType? type = null; RawPointerEventType? type = null;
if (ev.code == (ushort) EvKey.BTN_LEFT) if (ev.code == (ushort) EvKey.BTN_LEFT)
type = ev.value == 1 ? RawMouseEventType.LeftButtonDown : RawMouseEventType.LeftButtonUp; type = ev.value == 1 ? RawPointerEventType.LeftButtonDown : RawPointerEventType.LeftButtonUp;
if (ev.code == (ushort)EvKey.BTN_RIGHT) if (ev.code == (ushort)EvKey.BTN_RIGHT)
type = ev.value == 1 ? RawMouseEventType.RightButtonDown : RawMouseEventType.RightButtonUp; type = ev.value == 1 ? RawPointerEventType.RightButtonDown : RawPointerEventType.RightButtonUp;
if (ev.code == (ushort) EvKey.BTN_MIDDLE) if (ev.code == (ushort) EvKey.BTN_MIDDLE)
type = ev.value == 1 ? RawMouseEventType.MiddleButtonDown : RawMouseEventType.MiddleButtonUp; type = ev.value == 1 ? RawPointerEventType.MiddleButtonDown : RawPointerEventType.MiddleButtonUp;
if (!type.HasValue) if (!type.HasValue)
return; return;
Event?.Invoke(new RawMouseEventArgs(LinuxFramebufferPlatform.MouseDevice, Event?.Invoke(new RawPointerEventArgs(LinuxFramebufferPlatform.MouseDevice,
LinuxFramebufferPlatform.Timestamp, LinuxFramebufferPlatform.Timestamp,
LinuxFramebufferPlatform.TopLevel.InputRoot, type.Value, new Point(_x, _y), default(InputModifiers))); LinuxFramebufferPlatform.TopLevel.InputRoot, type.Value, new Point(_x, _y), default(InputModifiers)));
} }

38
src/Windows/Avalonia.Win32/WindowImpl.cs
View File

@ -532,15 +532,15 @@ namespace Avalonia.Win32
case UnmanagedMethods.WindowsMessage.WM_MBUTTONDOWN: case UnmanagedMethods.WindowsMessage.WM_MBUTTONDOWN:
if(ShouldIgnoreTouchEmulatedMessage()) if(ShouldIgnoreTouchEmulatedMessage())
break; break;
e = new RawMouseEventArgs( e = new RawPointerEventArgs(
WindowsMouseDevice.Instance, WindowsMouseDevice.Instance,
timestamp, timestamp,
_owner, _owner,
msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONDOWN msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONDOWN
? RawMouseEventType.LeftButtonDown ? RawPointerEventType.LeftButtonDown
: msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONDOWN : msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONDOWN
? RawMouseEventType.RightButtonDown ? RawPointerEventType.RightButtonDown
: RawMouseEventType.MiddleButtonDown, : RawPointerEventType.MiddleButtonDown,
DipFromLParam(lParam), GetMouseModifiers(wParam)); DipFromLParam(lParam), GetMouseModifiers(wParam));
break; break;
@ -549,15 +549,15 @@ namespace Avalonia.Win32
case UnmanagedMethods.WindowsMessage.WM_MBUTTONUP: case UnmanagedMethods.WindowsMessage.WM_MBUTTONUP:
if(ShouldIgnoreTouchEmulatedMessage()) if(ShouldIgnoreTouchEmulatedMessage())
break; break;
e = new RawMouseEventArgs( e = new RawPointerEventArgs(
WindowsMouseDevice.Instance, WindowsMouseDevice.Instance,
timestamp, timestamp,
_owner, _owner,
msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONUP msg == (int)UnmanagedMethods.WindowsMessage.WM_LBUTTONUP
? RawMouseEventType.LeftButtonUp ? RawPointerEventType.LeftButtonUp
: msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONUP : msg == (int)UnmanagedMethods.WindowsMessage.WM_RBUTTONUP
? RawMouseEventType.RightButtonUp ? RawPointerEventType.RightButtonUp
: RawMouseEventType.MiddleButtonUp, : RawPointerEventType.MiddleButtonUp,
DipFromLParam(lParam), GetMouseModifiers(wParam)); DipFromLParam(lParam), GetMouseModifiers(wParam));
break; break;
@ -577,11 +577,11 @@ namespace Avalonia.Win32
UnmanagedMethods.TrackMouseEvent(ref tm); UnmanagedMethods.TrackMouseEvent(ref tm);
} }
e = new RawMouseEventArgs( e = new RawPointerEventArgs(
WindowsMouseDevice.Instance, WindowsMouseDevice.Instance,
timestamp, timestamp,
_owner, _owner,
RawMouseEventType.Move, RawPointerEventType.Move,
DipFromLParam(lParam), GetMouseModifiers(wParam)); DipFromLParam(lParam), GetMouseModifiers(wParam));
break; break;
@ -606,26 +606,26 @@ namespace Avalonia.Win32
case UnmanagedMethods.WindowsMessage.WM_MOUSELEAVE: case UnmanagedMethods.WindowsMessage.WM_MOUSELEAVE:
_trackingMouse = false; _trackingMouse = false;
e = new RawMouseEventArgs( e = new RawPointerEventArgs(
WindowsMouseDevice.Instance, WindowsMouseDevice.Instance,
timestamp, timestamp,
_owner, _owner,
RawMouseEventType.LeaveWindow, RawPointerEventType.LeaveWindow,
new Point(), WindowsKeyboardDevice.Instance.Modifiers); new Point(), WindowsKeyboardDevice.Instance.Modifiers);
break; break;
case UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN: case UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN:
case UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN: case UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN:
case UnmanagedMethods.WindowsMessage.WM_NCMBUTTONDOWN: case UnmanagedMethods.WindowsMessage.WM_NCMBUTTONDOWN:
e = new RawMouseEventArgs( e = new RawPointerEventArgs(
WindowsMouseDevice.Instance, WindowsMouseDevice.Instance,
timestamp, timestamp,
_owner, _owner,
msg == (int)UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN msg == (int)UnmanagedMethods.WindowsMessage.WM_NCLBUTTONDOWN
? RawMouseEventType.NonClientLeftButtonDown ? RawPointerEventType.NonClientLeftButtonDown
: msg == (int)UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN : msg == (int)UnmanagedMethods.WindowsMessage.WM_NCRBUTTONDOWN
? RawMouseEventType.RightButtonDown ? RawPointerEventType.RightButtonDown
: RawMouseEventType.MiddleButtonDown, : RawPointerEventType.MiddleButtonDown,
new Point(0, 0), GetMouseModifiers(wParam)); new Point(0, 0), GetMouseModifiers(wParam));
break; break;
case WindowsMessage.WM_TOUCH: case WindowsMessage.WM_TOUCH:
@ -639,10 +639,10 @@ namespace Avalonia.Win32
Input?.Invoke(new RawTouchEventArgs(_touchDevice, touchInput.Time, Input?.Invoke(new RawTouchEventArgs(_touchDevice, touchInput.Time,
_owner, _owner,
touchInput.Flags.HasFlag(TouchInputFlags.TOUCHEVENTF_UP) ? touchInput.Flags.HasFlag(TouchInputFlags.TOUCHEVENTF_UP) ?
RawMouseEventType.TouchEnd : RawPointerEventType.TouchEnd :
touchInput.Flags.HasFlag(TouchInputFlags.TOUCHEVENTF_DOWN) ? touchInput.Flags.HasFlag(TouchInputFlags.TOUCHEVENTF_DOWN) ?
RawMouseEventType.TouchBegin : RawPointerEventType.TouchBegin :
RawMouseEventType.TouchUpdate, RawPointerEventType.TouchUpdate,
new Point(pt.X, pt.Y), new Point(pt.X, pt.Y),
WindowsKeyboardDevice.Instance.Modifiers, WindowsKeyboardDevice.Instance.Modifiers,
touchInput.Id)); touchInput.Id));

2
tests/Avalonia.Controls.UnitTests/MouseTestHelper.cs
View File

@ -9,7 +9,7 @@ namespace Avalonia.Controls.UnitTests
class TestPointer : IPointer class TestPointer : IPointer
{ {
public int Id { get; } = PointerIds.Next(); public int Id { get; } = Pointer.GetNextFreeId();
public void Capture(IInputElement control) public void Capture(IInputElement control)
{ {

2
tests/Avalonia.Controls.UnitTests/Platform/DefaultMenuInteractionHandlerTests.cs
View File

@ -12,7 +12,7 @@ namespace Avalonia.Controls.UnitTests.Platform
{ {
class FakePointer : IPointer class FakePointer : IPointer
{ {
public int Id { get; } = PointerIds.Next(); public int Id { get; } = Pointer.GetNextFreeId();
public void Capture(IInputElement control) public void Capture(IInputElement control)
{ {

4
tests/Avalonia.Input.UnitTests/MouseDeviceTests.cs
View File

@ -225,11 +225,11 @@ namespace Avalonia.Input.UnitTests
private void SendMouseMove(IInputManager inputManager, TestRoot root, Point p = new Point()) private void SendMouseMove(IInputManager inputManager, TestRoot root, Point p = new Point())
{ {
inputManager.ProcessInput(new RawMouseEventArgs( inputManager.ProcessInput(new RawPointerEventArgs(
root.MouseDevice, root.MouseDevice,
0, 0,
root, root,
RawMouseEventType.Move, RawPointerEventType.Move,
p, p,
InputModifiers.None)); InputModifiers.None));
} }

Write Preview
Loading…
Cancel
Save