diff options
| author | Mary <mary@mary.zone> | 2022-05-15 16:02:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 16:02:15 +0200 |
| commit | 7bc4971cf948b506f125ae29fd581795ccb3a10d (patch) | |
| tree | 4f772722216a09d8529271be232d52d0e52acbaa /Ryujinx.Ava/Input | |
| parent | 3551c18902d485da6b3345ba320179e2abdb44ea (diff) | |
misc: Clean up of CS project after Avalonia merge (#3340)
This reformat Avalonia csproj file, remove unused deps and reajust
Ryujinx csproj a bit after some other changes
Also updated OpenTK.Graphics
Diffstat (limited to 'Ryujinx.Ava/Input')
| -rw-r--r-- | Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs b/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs index 3babfe9d..1177e67a 100644 --- a/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs +++ b/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs @@ -4,11 +4,9 @@ using Ryujinx.Ava.Common.Locale; using Ryujinx.Input; using System; using System.Collections.Generic; -using System.Linq; using AvaKey = Avalonia.Input.Key; using Key = Ryujinx.Input.Key; -using TextInputEventArgs = OpenTK.Windowing.Common.TextInputEventArgs; namespace Ryujinx.Ava.Input { @@ -20,7 +18,7 @@ namespace Ryujinx.Ava.Input public event EventHandler<KeyEventArgs> KeyPressed; public event EventHandler<KeyEventArgs> KeyRelease; - public event EventHandler<TextInputEventArgs> TextInput; + public event EventHandler<string> TextInput; public string DriverName => "Avalonia"; @@ -36,9 +34,9 @@ namespace Ryujinx.Ava.Input _control.TextInput += Control_TextInput; } - private void Control_TextInput(object sender, Avalonia.Input.TextInputEventArgs e) + private void Control_TextInput(object sender, TextInputEventArgs e) { - TextInput?.Invoke(this, new TextInputEventArgs(e.Text.First())); + TextInput?.Invoke(this, e.Text); } public event Action<string> OnGamepadConnected |
