Merge pull request #7321 from ltetak/datagrid_osx_hotkeys

[macOS] DataGrid - handle OSX key modifiers (ctrl vs cmd)
AvaloniaUI · Jan 22, 2022 · 583075b · 583075b
2 parents 8e43e95 + 008acfd
commit 583075b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/src/Avalonia.Controls.DataGrid/DataGridColumn.cs b/src/Avalonia.Controls.DataGrid/DataGridColumn.cs
@@ -680,7 +680,7 @@ public static DataGridColumn GetColumnContainingElement(IControl element)
         public void ClearSort()
         {
             //InvokeProcessSort is already validating if sorting is possible
-            _headerCell?.InvokeProcessSort(Input.KeyModifiers.Control);
+            _headerCell?.InvokeProcessSort(KeyboardHelper.GetPlatformCtrlOrCmdKeyModifier());
         }
 
         /// <summary>

diff --git a/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs b/src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
@@ -4,22 +4,29 @@
 // All other rights reserved.
 
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 
 namespace Avalonia.Controls.Utils
 {
     internal static class KeyboardHelper
     {
-        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift)
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrlOrCmd, out bool shift)
         {
-            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
-            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
+            ctrlOrCmd = modifiers.HasFlag(GetPlatformCtrlOrCmdKeyModifier());
+            shift = modifiers.HasFlag(KeyModifiers.Shift);
         }
 
-        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrl, out bool shift, out bool alt)
+        public static void GetMetaKeyState(KeyModifiers modifiers, out bool ctrlOrCmd, out bool shift, out bool alt)
         {
-            ctrl = (modifiers & KeyModifiers.Control) == KeyModifiers.Control;
-            shift = (modifiers & KeyModifiers.Shift) == KeyModifiers.Shift;
-            alt = (modifiers & KeyModifiers.Alt) == KeyModifiers.Alt;
+            ctrlOrCmd = modifiers.HasFlag(GetPlatformCtrlOrCmdKeyModifier());
+            shift = modifiers.HasFlag(KeyModifiers.Shift);
+            alt = modifiers.HasFlag(KeyModifiers.Alt);
+        }
+
+        public static KeyModifiers GetPlatformCtrlOrCmdKeyModifier()
+        {                
+            var keymap = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>();
+            return keymap?.CommandModifiers ?? KeyModifiers.Control;
         }
     }
 }