JJBanana13/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2026-06-05 20:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed KeyDown events latching gameplay keys

Browse Source
This commit is contained in:
Babib3l
2026-03-21 23:32:46 +01:00
parent 7becde9d8e
commit 0b02e71a66
2 changed files with 10 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/Ryujinx/Input/AvaloniaKeyboardDriver.cs
View File

@@ -13,8 +13,8 @@ namespace Ryujinx.Ava.Input
{ {
private static readonly string[] _keyboardIdentifers = ["0"]; private static readonly string[] _keyboardIdentifers = ["0"];
private readonly Control _control; private readonly Control _control;
private readonly Dictionary<Key, int> _semanticPressedKeys; private readonly HashSet<Key> _semanticPressedKeys;
private readonly Dictionary<ConfigPhysicalKey, int> _physicalPressedKeys; private readonly HashSet<ConfigPhysicalKey> _physicalPressedKeys;
private readonly Dictionary<Key, ConfigPhysicalKey> _observedPhysicalKeysBySemanticKey; private readonly Dictionary<Key, ConfigPhysicalKey> _observedPhysicalKeysBySemanticKey;
private readonly KeyboardInputMode _defaultMode; private readonly KeyboardInputMode _defaultMode;
@@ -102,8 +102,8 @@ namespace Ryujinx.Ava.Input
} }
return mode == KeyboardInputMode.Physical return mode == KeyboardInputMode.Physical
? _physicalPressedKeys.ContainsKey((ConfigPhysicalKey)(int)key) ? _physicalPressedKeys.Contains((ConfigPhysicalKey)(int)key)
: _semanticPressedKeys.ContainsKey(key); : _semanticPressedKeys.Contains(key);
} }
internal void Clear(KeyboardInputMode mode) internal void Clear(KeyboardInputMode mode)
@@ -124,7 +124,7 @@ namespace Ryujinx.Ava.Input
_physicalPressedKeys.Clear(); _physicalPressedKeys.Clear();
} }
private static void UpdateKeyState(Dictionary<Key, int> pressedKeys, Key key, bool isPressed) private static void UpdateKeyState(HashSet<Key> pressedKeys, Key key, bool isPressed)
{ {
if (key is Key.Unknown or Key.Unbound) if (key is Key.Unknown or Key.Unbound)
{ {
@@ -133,32 +133,14 @@ namespace Ryujinx.Ava.Input
if (isPressed) if (isPressed)
{ {
if (pressedKeys.TryGetValue(key, out int count)) pressedKeys.Add(key);
{
pressedKeys[key] = count + 1;
}
else
{
pressedKeys[key] = 1;
}
return; return;
} }
if (pressedKeys.TryGetValue(key, out int currentCount)) pressedKeys.Remove(key);
{
if (currentCount <= 1)
{
pressedKeys.Remove(key);
}
else
{
pressedKeys[key] = currentCount - 1;
}
}
} }
private static void UpdateKeyState(Dictionary<ConfigPhysicalKey, int> pressedKeys, ConfigPhysicalKey key, bool isPressed) private static void UpdateKeyState(HashSet<ConfigPhysicalKey> pressedKeys, ConfigPhysicalKey key, bool isPressed)
{ {
if (key is ConfigPhysicalKey.Unknown or ConfigPhysicalKey.Unbound) if (key is ConfigPhysicalKey.Unknown or ConfigPhysicalKey.Unbound)
{ {
@@ -167,29 +149,11 @@ namespace Ryujinx.Ava.Input
if (isPressed) if (isPressed)
{ {
if (pressedKeys.TryGetValue(key, out int count)) pressedKeys.Add(key);
{
pressedKeys[key] = count + 1;
}
else
{
pressedKeys[key] = 1;
}
return; return;
} }
if (pressedKeys.TryGetValue(key, out int currentCount)) pressedKeys.Remove(key);
{
if (currentCount <= 1)
{
pressedKeys.Remove(key);
}
else
{
pressedKeys[key] = currentCount - 1;
}
}
} }
private void UpdateKeyStates(KeyEventArgs args, bool isPressed) private void UpdateKeyStates(KeyEventArgs args, bool isPressed)

1
src/Ryujinx/UI/Renderer/RendererHost.cs
View File

@@ -45,7 +45,6 @@ namespace Ryujinx.Ava.UI.Renderer
Content = EmbeddedWindow; Content = EmbeddedWindow;
} }
public void Dispose() public void Dispose()
{ {
if (EmbeddedWindow != null) if (EmbeddedWindow != null)