Creepso/Keaton-Ryujinx
1
0
Fork 0
mirror of https://github.com/KeatonTheBot/Ryujinx.git synced 2026-04-21 03:42:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: Added the ability to unbind hotkeys via pressing backspace.
Some checks are pending
Release job / Create tag (push) Waiting to run
Details
Release job / Release for linux-arm64 (push) Waiting to run
Details
Release job / Release for linux-x64 (push) Waiting to run
Details
Release job / Release for win-x64 (push) Waiting to run
Details
Release job / Release MacOS universal (push) Waiting to run
Details
Release job / flatpak_release (push) Blocked by required conditions
Details

Browse source
This commit is contained in:
GreemDev 2025-03-14 23:52:27 -05:00 committed by KeatonTheBot
parent e86801fa12
commit 7960ea643f
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Ryujinx/UI/Helpers/ButtonKeyAssigner.cs
View file

@ -87,8 +87,13 @@ namespace Ryujinx.Ava.UI.Helpers
ToggledButton.IsChecked = false; ToggledButton.IsChecked = false;
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton)); if (pressedButton.HasValue && pressedButton.Value.AsHidType<Key>() == Key.BackSpace)
{
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, new Button(Key.Unbound)));
return;
}
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
}); });
} }

11
src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
View file

@ -42,15 +42,6 @@ namespace Ryujinx.Ava.UI.Views.Settings
} }
} }
private void MouseClick(object sender, PointerPressedEventArgs e)
{
bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
_currentAssigner?.Cancel(shouldUnbind);
PointerPressed -= MouseClick;
}
private void Button_IsCheckedChanged(object sender, RoutedEventArgs e) private void Button_IsCheckedChanged(object sender, RoutedEventArgs e)
{ {
if (sender is ToggleButton button) if (sender is ToggleButton button)
@ -68,8 +59,6 @@ namespace Ryujinx.Ava.UI.Views.Settings
this.Focus(NavigationMethod.Pointer); this.Focus(NavigationMethod.Pointer);
PointerPressed += MouseClick;
var keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad("0"); var keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad("0");
IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard); IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);