From 0cd25052fb11fc9a41cafbdf144fb56c6db6b27d Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 10 Aug 2019 11:59:22 +0300 Subject: [PATCH] Cleanup --- src/Avalonia.Input/PointerEventArgs.cs | 3 ++- src/Avalonia.X11/X11Window.cs | 4 +--- src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs | 1 - src/Windows/Avalonia.Win32/WindowImpl.cs | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Avalonia.Input/PointerEventArgs.cs b/src/Avalonia.Input/PointerEventArgs.cs index dd9ac593aa..5b3c43e4df 100644 --- a/src/Avalonia.Input/PointerEventArgs.cs +++ b/src/Avalonia.Input/PointerEventArgs.cs @@ -123,7 +123,8 @@ namespace Avalonia.Input [Obsolete("Use DoubleTapped or DoubleRightTapped event instead")] public int ClickCount => _obsoleteClickCount; - [Obsolete] public MouseButton MouseButton => GetPointerPoint(null).Properties.GetObsoleteMouseButton(); + [Obsolete("Use PointerUpdateKind")] + public MouseButton MouseButton => Properties.GetObsoleteMouseButton(); } public class PointerReleasedEventArgs : PointerEventArgs diff --git a/src/Avalonia.X11/X11Window.cs b/src/Avalonia.X11/X11Window.cs index accd7ea40a..975b3d11d7 100644 --- a/src/Avalonia.X11/X11Window.cs +++ b/src/Avalonia.X11/X11Window.cs @@ -438,7 +438,7 @@ namespace Avalonia.X11 ScheduleInput(new RawKeyEventArgs(_keyboard, (ulong)ev.KeyEvent.time.ToInt64(), ev.type == XEventName.KeyPress ? RawKeyEventType.KeyDown : RawKeyEventType.KeyUp, - X11KeyTransform.ConvertKey(key), TranslateRawModifiers(ev.KeyEvent.state)), ref ev); + X11KeyTransform.ConvertKey(key), TranslateModifiers(ev.KeyEvent.state)), ref ev); if (ev.type == XEventName.KeyPress) { @@ -558,8 +558,6 @@ namespace Avalonia.X11 } - - RawInputModifiers TranslateRawModifiers(XModifierMask state) => (RawInputModifiers)TranslateModifiers(state); RawInputModifiers TranslateModifiers(XModifierMask state) { var rv = default(RawInputModifiers); diff --git a/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs b/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs index 233f110c37..fda5483b00 100644 --- a/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs +++ b/src/Windows/Avalonia.Win32/Input/WindowsKeyboardDevice.cs @@ -14,7 +14,6 @@ namespace Avalonia.Win32.Input public new static WindowsKeyboardDevice Instance { get; } = new WindowsKeyboardDevice(); - public RawInputModifiers RawModifiers => Modifiers; public RawInputModifiers Modifiers { get diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index c3a0a9c717..9bd58c10bc 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -510,7 +510,7 @@ namespace Avalonia.Win32 WindowsKeyboardDevice.Instance, timestamp, RawKeyEventType.KeyDown, - KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.RawModifiers); + KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.Modifiers); break; case UnmanagedMethods.WindowsMessage.WM_MENUCHAR: @@ -523,7 +523,7 @@ namespace Avalonia.Win32 WindowsKeyboardDevice.Instance, timestamp, RawKeyEventType.KeyUp, - KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.RawModifiers); + KeyInterop.KeyFromVirtualKey(ToInt32(wParam)), WindowsKeyboardDevice.Instance.Modifiers); break; case UnmanagedMethods.WindowsMessage.WM_CHAR: // Ignore control chars