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/Ui/Applet/AvaloniaDynamicTextInputHandler.cs | |
| parent | 3551c18902d485da6b3345ba320179e2abdb44ea (diff) | |
misc: Clean up of CS project after Avalonia merge (#3340)1.1.124
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/Ui/Applet/AvaloniaDynamicTextInputHandler.cs')
| -rw-r--r-- | Ryujinx.Ava/Ui/Applet/AvaloniaDynamicTextInputHandler.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Ryujinx.Ava/Ui/Applet/AvaloniaDynamicTextInputHandler.cs b/Ryujinx.Ava/Ui/Applet/AvaloniaDynamicTextInputHandler.cs index 714b6360..294e8965 100644 --- a/Ryujinx.Ava/Ui/Applet/AvaloniaDynamicTextInputHandler.cs +++ b/Ryujinx.Ava/Ui/Applet/AvaloniaDynamicTextInputHandler.cs @@ -1,15 +1,16 @@ using Avalonia; using Avalonia.Controls; +using Avalonia.Input; using Avalonia.Threading; -using OpenTK.Windowing.Common; using Ryujinx.Ava.Input; using Ryujinx.Ava.Ui.Controls; using Ryujinx.Ava.Ui.Windows; -using Ryujinx.Common.Configuration.Hid; using Ryujinx.HLE.Ui; using System; using System.Threading; +using HidKey = Ryujinx.Common.Configuration.Hid.Key; + namespace Ryujinx.Ava.Ui.Applet { class AvaloniaDynamicTextInputHandler : IDynamicTextInputHandler @@ -54,20 +55,20 @@ namespace Ryujinx.Ava.Ui.Applet TextChangedEvent?.Invoke(_hiddenTextBox.Text ?? string.Empty, _hiddenTextBox.SelectionStart, _hiddenTextBox.SelectionEnd, true); } - private void AvaloniaDynamicTextInputHandler_TextInput(object sender, TextInputEventArgs e) + private void AvaloniaDynamicTextInputHandler_TextInput(object sender, string text) { Dispatcher.UIThread.InvokeAsync(() => { if (_canProcessInput) { - _hiddenTextBox.SendText(e.AsString); + _hiddenTextBox.SendText(text); } }); } private void AvaloniaDynamicTextInputHandler_KeyRelease(object sender, Avalonia.Input.KeyEventArgs e) { - var key = (Key)AvaloniaMappingHelper.ToInputKey(e.Key); + var key = (HidKey)AvaloniaMappingHelper.ToInputKey(e.Key); if (!(KeyReleasedEvent?.Invoke(key)).GetValueOrDefault(true)) { @@ -85,9 +86,9 @@ namespace Ryujinx.Ava.Ui.Applet }); } - private void AvaloniaDynamicTextInputHandler_KeyPressed(object sender, Avalonia.Input.KeyEventArgs e) + private void AvaloniaDynamicTextInputHandler_KeyPressed(object sender, KeyEventArgs e) { - var key = (Key)AvaloniaMappingHelper.ToInputKey(e.Key); + var key = (HidKey)AvaloniaMappingHelper.ToInputKey(e.Key); if (!(KeyPressedEvent?.Invoke(key)).GetValueOrDefault(true)) { |