mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix direct keyboard not working when connected with a controller

Browse source 
- Pass KeyboardDriver to NpadController.GetHLEKeyboardInput().
- Always fetch all keyboards if Direct Keyboard is turned on.
- Remove unnecessary return null.
This commit is contained in:
MaxLastBreath 2024-04-25 23:20:04 +03:00
commit 7e118bc07a
2 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Ryujinx.Input/HLE/NpadController.cs
View file

@ -487,10 +487,10 @@ namespace Ryujinx.Input.HLE
return value;
}
public KeyboardInput? GetHLEKeyboardInput()
{
if (_gamepad is IKeyboard keyboard)
public KeyboardInput? GetHLEKeyboardInput(IGamepadDriver KeyboardDriver)
{
var keyboard = KeyboardDriver.GetGamepad("0") as IKeyboard;
KeyboardStateSnapshot keyboardState = keyboard.GetKeyboardStateSnapshot();
KeyboardInput hidKeyboard = new()
@ -514,9 +514,7 @@ namespace Ryujinx.Input.HLE
}
return hidKeyboard;
}
return null;
}

2
src/Ryujinx.Input/HLE/NpadManager.cs
View file

@ -234,7 +234,7 @@ namespace Ryujinx.Input.HLE
if (_enableKeyboard)
{
hleKeyboardInput = controller.GetHLEKeyboardInput();
hleKeyboardInput = controller.GetHLEKeyboardInput(_keyboardDriver);
}
}
else