diff --git a/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs b/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs index b107898e4..edcdb52fd 100644 --- a/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs +++ b/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs @@ -1,5 +1,6 @@ using Avalonia.Controls; using Avalonia.Input; +using Avalonia.Interactivity; using Ryujinx.Ava.Common.Locale; using Ryujinx.Input; using System; @@ -30,6 +31,7 @@ namespace Ryujinx.Ava.Input _control.KeyDown += OnKeyPress; _control.KeyUp += OnKeyRelease; _control.TextInput += Control_TextInput; + _control.AddHandler(InputElement.TextInputEvent, Control_LastChanceTextInput, RoutingStrategies.Bubble); } private void Control_TextInput(object sender, TextInputEventArgs e) @@ -37,6 +39,12 @@ namespace Ryujinx.Ava.Input TextInput?.Invoke(this, e.Text); } + private void Control_LastChanceTextInput(object sender, TextInputEventArgs e) + { + // Swallow event + e.Handled = true; + } + public event Action OnGamepadConnected { add { }