mirrors/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-08 12:41:43 +00:00
Code Issues Releases Activity

Revert "Disable keyboard controller input while swkbd is open (foreground) (#…" (#6805)

Browse source 
This reverts commit a3dc295c5f.
This commit is contained in:
gdkchan 2024-05-15 02:20:24 -03:00 committed by GitHub
parent 2ca0b17339
commit cdccf89e10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Ryujinx.Gtk3/Input/GTK3/GTK3KeyboardDriver.cs
View file

@ -81,11 +81,6 @@ namespace Ryujinx.Input.GTK3
return _pressedKeys.Contains(nativeKey); return _pressedKeys.Contains(nativeKey);
} }
public void Clear()
{
_pressedKeys.Clear();
}
public IGamepad GetGamepad(string id) public IGamepad GetGamepad(string id)
{ {
if (!_keyboardIdentifers[0].Equals(id)) if (!_keyboardIdentifers[0].Equals(id))

3
src/Ryujinx.Gtk3/UI/Applet/GtkHostUIHandler.cs
View file

@ -107,8 +107,6 @@ namespace Ryujinx.UI.Applet
swkbdDialog.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax); swkbdDialog.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
swkbdDialog.SetInputValidation(args.KeyboardMode); swkbdDialog.SetInputValidation(args.KeyboardMode);
((MainWindow)_parent).RendererWidget.NpadManager.BlockInputUpdates();
if (swkbdDialog.Run() == (int)ResponseType.Ok) if (swkbdDialog.Run() == (int)ResponseType.Ok)
{ {
inputText = swkbdDialog.InputEntry.Text; inputText = swkbdDialog.InputEntry.Text;
@ -130,7 +128,6 @@ namespace Ryujinx.UI.Applet
}); });
dialogCloseEvent.WaitOne(); dialogCloseEvent.WaitOne();
((MainWindow)_parent).RendererWidget.NpadManager.UnblockInputUpdates();
userText = error ? null : inputText; userText = error ? null : inputText;

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

@ -174,11 +174,6 @@ namespace Ryujinx.Input.HLE
{ {
lock (_lock) lock (_lock)
{ {
foreach (InputConfig inputConfig in _inputConfig)
{
_controllers[(int)inputConfig.PlayerIndex].GamepadDriver.Clear();
}
_blockInputUpdates = false; _blockInputUpdates = false;
} }
} }

6
src/Ryujinx.Input/IGamepadDriver.cs
View file

@ -33,11 +33,5 @@ namespace Ryujinx.Input
/// <param name="id">The unique id of the gamepad</param> /// <param name="id">The unique id of the gamepad</param>
/// <returns>An instance of <see cref="IGamepad"/> associated to the gamepad id given or null if not found</returns> /// <returns>An instance of <see cref="IGamepad"/> associated to the gamepad id given or null if not found</returns>
IGamepad GetGamepad(string id); IGamepad GetGamepad(string id);
/// <summary>
/// Flush the internal state of the driver.
/// </summary>
/// <remarks>Does nothing by default.</remarks>
void Clear() { }
} }
} }

2
src/Ryujinx/Input/AvaloniaKeyboard.cs
View file

@ -195,7 +195,7 @@ namespace Ryujinx.Ava.Input
public void Clear() public void Clear()
{ {
_driver?.Clear(); _driver?.ResetKeys();
} }
public void Dispose() { } public void Dispose() { }

2
src/Ryujinx/Input/AvaloniaKeyboardDriver.cs
View file

@ -94,7 +94,7 @@ namespace Ryujinx.Ava.Input
return _pressedKeys.Contains(nativeKey); return _pressedKeys.Contains(nativeKey);
} }
public void Clear() public void ResetKeys()
{ {
_pressedKeys.Clear(); _pressedKeys.Clear();
} }

2
src/Ryujinx/UI/Applet/AvaHostUIHandler.cs
View file

@ -122,7 +122,6 @@ namespace Ryujinx.Ava.UI.Applet
{ {
try try
{ {
_parent.ViewModel.AppHost.NpadManager.BlockInputUpdates();
var response = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args); var response = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args);
if (response.Result == UserResult.Ok) if (response.Result == UserResult.Ok)
@ -144,7 +143,6 @@ namespace Ryujinx.Ava.UI.Applet
}); });
dialogCloseEvent.WaitOne(); dialogCloseEvent.WaitOne();
_parent.ViewModel.AppHost.NpadManager.UnblockInputUpdates();
userText = error ? null : inputText; userText = error ? null : inputText;