From c5a498e5634316556d613220d2066744709c18c3 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Sun, 13 Jun 2021 02:43:07 -0400 Subject: [PATCH] Shift+F10 is windows specific gesture --- .../Platform/PlatformHotkeyConfiguration.cs | 9 +++++---- src/Windows/Avalonia.Win32/Win32Platform.cs | 9 ++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs b/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs index 42ce113345..521f847a0a 100644 --- a/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs +++ b/src/Avalonia.Input/Platform/PlatformHotkeyConfiguration.cs @@ -1,14 +1,16 @@ using System.Collections.Generic; +#nullable enable + namespace Avalonia.Input.Platform { public class PlatformHotkeyConfiguration { public PlatformHotkeyConfiguration() : this(KeyModifiers.Control) { - + } - + public PlatformHotkeyConfiguration(KeyModifiers commandModifiers, KeyModifiers selectionModifiers = KeyModifiers.Shift, KeyModifiers wholeWordTextActionModifiers = KeyModifiers.Control) @@ -75,8 +77,7 @@ namespace Avalonia.Input.Platform }; OpenContextMenu = new List { - new KeyGesture(Key.F10, KeyModifiers.Shift), - new KeyGesture(Key.Apps), + new KeyGesture(Key.Apps) }; } diff --git a/src/Windows/Avalonia.Win32/Win32Platform.cs b/src/Windows/Avalonia.Win32/Win32Platform.cs index d92bd08d01..84e61ca007 100644 --- a/src/Windows/Avalonia.Win32/Win32Platform.cs +++ b/src/Windows/Avalonia.Win32/Win32Platform.cs @@ -112,7 +112,14 @@ namespace Avalonia.Win32 .Bind().ToConstant(new DefaultRenderTimer(60)) .Bind().ToSingleton() .Bind().ToConstant(s_instance) - .Bind().ToSingleton() + .Bind().ToConstant(new PlatformHotkeyConfiguration(KeyModifiers.Control) + { + OpenContextMenu = + { + // Add Shift+F10 + new KeyGesture(Key.F10, KeyModifiers.Shift) + } + }) .Bind().ToConstant(s_instance) .Bind().ToConstant(new NonPumpingSyncContext.HelperImpl()) .Bind().ToConstant(new WindowsMountedVolumeInfoProvider());