Skip to content

Allow Textbox to use keyboard despite hotkeys #11791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions src/Files.App/Commands/HotKeyHelpers.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using Windows.System;

namespace Files.App.Commands
{
internal static class HotKeyHelpers
{
private static readonly ImmutableArray<VirtualKey> globalKeys = new List<VirtualKey>
{
VirtualKey.GoHome,
VirtualKey.GoBack,
VirtualKey.GoForward,
VirtualKey.Application,
VirtualKey.Favorites,
VirtualKey.Search,
VirtualKey.Refresh,
VirtualKey.Pause,
VirtualKey.Sleep,
VirtualKey.Print,
VirtualKey.F1,
VirtualKey.F2,
VirtualKey.F3,
VirtualKey.F4,
VirtualKey.F5,
VirtualKey.F6,
VirtualKey.F7,
VirtualKey.F8,
VirtualKey.F9,
VirtualKey.F10,
VirtualKey.F11,
VirtualKey.F12,
VirtualKey.F13,
VirtualKey.F14,
VirtualKey.F15,
VirtualKey.F16,
VirtualKey.F17,
VirtualKey.F18,
VirtualKey.F19,
VirtualKey.F20,
VirtualKey.F21,
VirtualKey.F22,
VirtualKey.F23,
VirtualKey.F24,
}.ToImmutableArray();

private static readonly ImmutableArray<HotKey> textBoxHotKeys = new List<HotKey>
{
new HotKey(VirtualKey.X, VirtualKeyModifiers.Control), // Cut
new HotKey(VirtualKey.C, VirtualKeyModifiers.Control), // Copy
new HotKey(VirtualKey.V, VirtualKeyModifiers.Control), // Paste
new HotKey(VirtualKey.A, VirtualKeyModifiers.Control), // Select all
new HotKey(VirtualKey.Z, VirtualKeyModifiers.Control), // Cancel
}.ToImmutableArray();

public static bool IsGlobalKey(this VirtualKey key) => globalKeys.Contains(key);
public static bool IsTextBoxHotKey(this HotKey hotKey) => textBoxHotKeys.Contains(hotKey);
}
}
20 changes: 13 additions & 7 deletions src/Files.App/Views/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -235,17 +235,23 @@ protected override async void OnPreviewKeyDown(KeyRoutedEventArgs e)
currentModifiers |= VirtualKeyModifiers.Shift;
break;
default:
// break for natives hotkeys in textbox (cut/copy/paste/selectAll/cancel)
HotKey hotKey = new(e.Key, currentModifiers);

// A textbox takes precedence over certain hotkeys.
bool isTextBox = e.OriginalSource is DependencyObject source && source.FindAscendantOrSelf<TextBox>() is not null;
if (isTextBox &&
currentModifiers is VirtualKeyModifiers.Control &&
e.Key is VirtualKey.X or VirtualKey.C or VirtualKey.V or VirtualKey.A or VirtualKey.Z)
if (isTextBox)
{
break;
if (hotKey.IsTextBoxHotKey())
{
break;
}
if (currentModifiers is VirtualKeyModifiers.None && !e.Key.IsGlobalKey())
{
break;
}
}

// execute command for hotkey
var hotKey = new HotKey(e.Key, currentModifiers);
// Execute command for hotkey
var command = Commands[hotKey];
if (command.Code is not CommandCodes.None && keyReleased)
{
Expand Down