From fc9a6d5746459e23ef2deaaab7d334e64f021b2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sun, 2 Feb 2020 23:39:45 +0000 Subject: [PATCH] Updated obsolete API usages. --- src/Avalonia.Controls.DataGrid/DataGrid.cs | 32 +++++++++---------- .../DataGridColumnHeader.cs | 16 +++++----- .../Utils/KeyboardHelper.cs | 15 +++++---- src/Avalonia.Controls/Calendar/Calendar.cs | 4 +-- .../Calendar/CalendarExtensions.cs | 6 ++-- .../Calendar/CalendarItem.cs | 2 +- src/Avalonia.Controls/Calendar/DatePicker.cs | 2 +- src/Avalonia.Controls/ComboBox.cs | 2 +- .../SelectingItemsControlSelectionAdapter.cs | 2 +- .../KeyboardNavigationHandler.cs | 2 +- 10 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs index 86133d5fdb..e16e11cdd6 100644 --- a/src/Avalonia.Controls.DataGrid/DataGrid.cs +++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs @@ -2472,25 +2472,25 @@ namespace Avalonia.Controls internal bool ProcessDownKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessDownKeyInternal(shift, ctrl); } internal bool ProcessEndKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessEndKey(shift, ctrl); } internal bool ProcessEnterKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessEnterKey(shift, ctrl); } internal bool ProcessHomeKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessHomeKey(shift, ctrl); } @@ -2530,25 +2530,25 @@ namespace Avalonia.Controls internal bool ProcessLeftKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessLeftKey(shift, ctrl); } internal bool ProcessNextKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessNextKey(shift, ctrl); } internal bool ProcessPriorKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessPriorKey(shift, ctrl); } internal bool ProcessRightKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessRightKey(shift, ctrl); } @@ -2666,7 +2666,7 @@ namespace Avalonia.Controls internal bool ProcessUpKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessUpKey(shift, ctrl); } @@ -2934,7 +2934,7 @@ namespace Avalonia.Controls //TODO: Ensure left button is checked for internal bool UpdateStateOnMouseLeftButtonDown(PointerPressedEventArgs pointerPressedEventArgs, int columnIndex, int slot, bool allowEdit) { - KeyboardHelper.GetMetaKeyState(pointerPressedEventArgs.InputModifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(pointerPressedEventArgs.KeyModifiers, out bool ctrl, out bool shift); return UpdateStateOnMouseLeftButtonDown(pointerPressedEventArgs, columnIndex, slot, allowEdit, shift, ctrl); } @@ -4376,7 +4376,7 @@ namespace Avalonia.Controls private bool ProcessAKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift, out bool alt); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift, out bool alt); if (ctrl && !shift && !alt && SelectionMode == DataGridSelectionMode.Extended) { @@ -4442,10 +4442,10 @@ namespace Avalonia.Controls return ProcessAKey(e); case Key.C: - return ProcessCopyKey(e.Modifiers); + return ProcessCopyKey(e.KeyModifiers); case Key.Insert: - return ProcessCopyKey(e.Modifiers); + return ProcessCopyKey(e.KeyModifiers); } if (focusDataGrid) { @@ -4644,7 +4644,7 @@ namespace Avalonia.Controls private bool ProcessF2Key(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); if (!shift && !ctrl && _editingColumnIndex == -1 && CurrentColumnIndex != -1 && GetRowSelection(CurrentSlot) && @@ -5001,7 +5001,7 @@ namespace Avalonia.Controls private bool ProcessTabKey(KeyEventArgs e) { - KeyboardHelper.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); return ProcessTabKey(e, shift, ctrl); } @@ -5787,7 +5787,7 @@ namespace Avalonia.Controls /// to the Clipboard as text. /// /// Whether or not the DataGrid handled the key press. - private bool ProcessCopyKey(InputModifiers modifiers) + private bool ProcessCopyKey(KeyModifiers modifiers) { KeyboardHelper.GetMetaKeyState(modifiers, out bool ctrl, out bool shift, out bool alt); diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs index d1651b2d09..062fdeb4d3 100644 --- a/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs +++ b/src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs @@ -190,28 +190,28 @@ namespace Avalonia.Controls } } - internal void OnMouseLeftButtonUp_Click(InputModifiers inputModifiers, ref bool handled) + internal void OnMouseLeftButtonUp_Click(KeyModifiers keyModifiers, ref bool handled) { // completed a click without dragging, so we're sorting - InvokeProcessSort(inputModifiers); + InvokeProcessSort(keyModifiers); handled = true; } - internal void InvokeProcessSort(InputModifiers inputModifiers) + internal void InvokeProcessSort(KeyModifiers keyModifiers) { Debug.Assert(OwningGrid != null); - if (OwningGrid.WaitForLostFocus(() => InvokeProcessSort(inputModifiers))) + if (OwningGrid.WaitForLostFocus(() => InvokeProcessSort(keyModifiers))) { return; } if (OwningGrid.CommitEdit(DataGridEditingUnit.Row, exitEditingMode: true)) { - Avalonia.Threading.Dispatcher.UIThread.Post(() => ProcessSort(inputModifiers)); + Avalonia.Threading.Dispatcher.UIThread.Post(() => ProcessSort(keyModifiers)); } } //TODO GroupSorting - internal void ProcessSort(InputModifiers inputModifiers) + internal void ProcessSort(KeyModifiers keyModifiers) { // if we can sort: // - DataConnection.AllowSort is true, and @@ -233,7 +233,7 @@ namespace Avalonia.Controls DataGridSortDescription newSort; - KeyboardHelper.GetMetaKeyState(inputModifiers, out bool ctrl, out bool shift); + KeyboardHelper.GetMetaKeyState(keyModifiers, out bool ctrl, out bool shift); DataGridSortDescription sort = OwningColumn.GetSortDescription(); IDataGridCollectionView collectionView = owningGrid.DataConnection.CollectionView; @@ -371,7 +371,7 @@ namespace Avalonia.Controls { if (_dragMode == DragMode.MouseDown) { - OnMouseLeftButtonUp_Click(args.InputModifiers, ref handled); + OnMouseLeftButtonUp_Click(args.KeyModifiers, ref handled); } else if (_dragMode == DragMode.Reorder) { diff --git a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs index 473ddce3ad..351deceb48 100644 --- a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs +++ b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs @@ -9,16 +9,17 @@ namespace Avalonia.Controls.Utils { internal static class KeyboardHelper { - public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift) + public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift) { - ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control; - shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift; + ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control; + shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift; } - public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift, out bool alt) + + public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift, out bool alt) { - ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control; - shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift; - alt = (modifiers & InputModifiers.Alt) == InputModifiers.Alt; + ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control; + shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift; + alt = (modifiers & KeyModifiers.Alt) == KeyModifiers.Alt; } } } diff --git a/src/Avalonia.Controls/Calendar/Calendar.cs b/src/Avalonia.Controls/Calendar/Calendar.cs index 94f8ad41a0..f412cea20a 100644 --- a/src/Avalonia.Controls/Calendar/Calendar.cs +++ b/src/Avalonia.Controls/Calendar/Calendar.cs @@ -1575,7 +1575,7 @@ namespace Avalonia.Controls base.OnPointerWheelChanged(e); if (!e.Handled) { - CalendarExtensions.GetMetaKeyState(e.InputModifiers, out bool ctrl, out bool shift); + CalendarExtensions.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); if (!ctrl) { @@ -1631,7 +1631,7 @@ namespace Avalonia.Controls // Some keys (e.g. Left/Right) need to be translated in RightToLeft mode Key invariantKey = e.Key; //InteractionHelper.GetLogicalKey(FlowDirection, e.Key); - CalendarExtensions.GetMetaKeyState(e.Modifiers, out bool ctrl, out bool shift); + CalendarExtensions.GetMetaKeyState(e.KeyModifiers, out bool ctrl, out bool shift); switch (invariantKey) { diff --git a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs index 73de1c38f3..00b5ce10bc 100644 --- a/src/Avalonia.Controls/Calendar/CalendarExtensions.cs +++ b/src/Avalonia.Controls/Calendar/CalendarExtensions.cs @@ -9,10 +9,10 @@ namespace Avalonia.Controls.Primitives { internal static class CalendarExtensions { - public static void GetMetaKeyState(InputModifiers modifiers, out bool ctrl, out bool shift) + public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift) { - ctrl = (modifiers & InputModifiers.Control) == InputModifiers.Control; - shift = (modifiers & InputModifiers.Shift) == InputModifiers.Shift; + ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control; + shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift; } } } diff --git a/src/Avalonia.Controls/Calendar/CalendarItem.cs b/src/Avalonia.Controls/Calendar/CalendarItem.cs index 395196d926..d6874e1ad6 100644 --- a/src/Avalonia.Controls/Calendar/CalendarItem.cs +++ b/src/Avalonia.Controls/Calendar/CalendarItem.cs @@ -958,7 +958,7 @@ namespace Avalonia.Controls.Primitives } bool ctrl, shift; - CalendarExtensions.GetMetaKeyState(e.InputModifiers, out ctrl, out shift); + CalendarExtensions.GetMetaKeyState(e.KeyModifiers, out ctrl, out shift); CalendarDayButton b = sender as CalendarDayButton; if (b != null) diff --git a/src/Avalonia.Controls/Calendar/DatePicker.cs b/src/Avalonia.Controls/Calendar/DatePicker.cs index b4d4fed9fc..46a1f5557b 100644 --- a/src/Avalonia.Controls/Calendar/DatePicker.cs +++ b/src/Avalonia.Controls/Calendar/DatePicker.cs @@ -1008,7 +1008,7 @@ namespace Avalonia.Controls } case Key.Down: { - if ((e.Modifiers & InputModifiers.Control) == InputModifiers.Control) + if ((e.KeyModifiers & KeyModifiers.Control) == KeyModifiers.Control) { HandlePopUp(); return true; diff --git a/src/Avalonia.Controls/ComboBox.cs b/src/Avalonia.Controls/ComboBox.cs index c2cf20b32d..9d471a0fc0 100644 --- a/src/Avalonia.Controls/ComboBox.cs +++ b/src/Avalonia.Controls/ComboBox.cs @@ -130,7 +130,7 @@ namespace Avalonia.Controls return; if (e.Key == Key.F4 || - ((e.Key == Key.Down || e.Key == Key.Up) && ((e.Modifiers & InputModifiers.Alt) != 0))) + ((e.Key == Key.Down || e.Key == Key.Up) && ((e.KeyModifiers & KeyModifiers.Alt) != 0))) { IsDropDownOpen = !IsDropDownOpen; e.Handled = true; diff --git a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs index 78361fcc8f..7f2008c739 100644 --- a/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs +++ b/src/Avalonia.Controls/Utils/SelectingItemsControlSelectionAdapter.cs @@ -261,7 +261,7 @@ namespace Avalonia.Controls.Utils break; case Key.Down: - if ((e.Modifiers & InputModifiers.Alt) == InputModifiers.None) + if ((e.KeyModifiers & KeyModifiers.Alt) == KeyModifiers.None) { SelectedIndexIncrement(); e.Handled = true; diff --git a/src/Avalonia.Input/KeyboardNavigationHandler.cs b/src/Avalonia.Input/KeyboardNavigationHandler.cs index 32faf98603..aef98ddff8 100644 --- a/src/Avalonia.Input/KeyboardNavigationHandler.cs +++ b/src/Avalonia.Input/KeyboardNavigationHandler.cs @@ -124,7 +124,7 @@ namespace Avalonia.Input if (current != null && e.Key == Key.Tab) { - var direction = (e.Modifiers & InputModifiers.Shift) == 0 ? + var direction = (e.KeyModifiers & KeyModifiers.Shift) == 0 ? NavigationDirection.Next : NavigationDirection.Previous; Move(current, direction, e.Modifiers); e.Handled = true;