mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2025-04-25 10:40:16 -05:00

* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address dotnet format CA1401 warnings * Address remaining dotnet format analyzer warnings * Address review comments * dotnet-format fixes after rebase * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Another rebase, another dotnet format run * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Address IDE0260 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * dotnet format pass with new editorconfig * Fix naming style issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Revert one suggestion * Second dotnet format pass and fix build issues * Final pass of dotnet format * Add trailing commas * Fix formatting issues * Keep unnecessary assignment in IconColorPicker.cs * Use using declarations and extend resource lifetimes * Fix rebase issues * Adjust comment spacing * Fix typo * Fix naming issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Revert unintentional change * Remove unused file * Remove static keyword from ViewModels Binding of static members doesn't work and is silently ignored. --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
163 lines
5.6 KiB
C#
163 lines
5.6 KiB
C#
using Avalonia;
|
|
using Avalonia.Controls;
|
|
using Avalonia.Input;
|
|
using Avalonia.Threading;
|
|
using Ryujinx.Ava.Input;
|
|
using Ryujinx.Ava.UI.Helpers;
|
|
using Ryujinx.Ava.UI.Windows;
|
|
using Ryujinx.HLE.Ui;
|
|
using System;
|
|
using System.Threading;
|
|
using HidKey = Ryujinx.Common.Configuration.Hid.Key;
|
|
|
|
namespace Ryujinx.Ava.UI.Applet
|
|
{
|
|
class AvaloniaDynamicTextInputHandler : IDynamicTextInputHandler
|
|
{
|
|
private MainWindow _parent;
|
|
private readonly OffscreenTextBox _hiddenTextBox;
|
|
private bool _canProcessInput;
|
|
private IDisposable _textChangedSubscription;
|
|
private IDisposable _selectionStartChangedSubscription;
|
|
private IDisposable _selectionEndtextChangedSubscription;
|
|
|
|
public AvaloniaDynamicTextInputHandler(MainWindow parent)
|
|
{
|
|
_parent = parent;
|
|
|
|
(_parent.InputManager.KeyboardDriver as AvaloniaKeyboardDriver).KeyPressed += AvaloniaDynamicTextInputHandler_KeyPressed;
|
|
(_parent.InputManager.KeyboardDriver as AvaloniaKeyboardDriver).KeyRelease += AvaloniaDynamicTextInputHandler_KeyRelease;
|
|
(_parent.InputManager.KeyboardDriver as AvaloniaKeyboardDriver).TextInput += AvaloniaDynamicTextInputHandler_TextInput;
|
|
|
|
_hiddenTextBox = _parent.HiddenTextBox;
|
|
|
|
Dispatcher.UIThread.Post(() =>
|
|
{
|
|
_textChangedSubscription = _hiddenTextBox.GetObservable(TextBox.TextProperty).Subscribe(TextChanged);
|
|
_selectionStartChangedSubscription = _hiddenTextBox.GetObservable(TextBox.SelectionStartProperty).Subscribe(SelectionChanged);
|
|
_selectionEndtextChangedSubscription = _hiddenTextBox.GetObservable(TextBox.SelectionEndProperty).Subscribe(SelectionChanged);
|
|
});
|
|
}
|
|
|
|
private void TextChanged(string text)
|
|
{
|
|
TextChangedEvent?.Invoke(text ?? string.Empty, _hiddenTextBox.SelectionStart, _hiddenTextBox.SelectionEnd, true);
|
|
}
|
|
|
|
private void SelectionChanged(int selection)
|
|
{
|
|
if (_hiddenTextBox.SelectionEnd < _hiddenTextBox.SelectionStart)
|
|
{
|
|
_hiddenTextBox.SelectionStart = _hiddenTextBox.SelectionEnd;
|
|
}
|
|
|
|
TextChangedEvent?.Invoke(_hiddenTextBox.Text ?? string.Empty, _hiddenTextBox.SelectionStart, _hiddenTextBox.SelectionEnd, true);
|
|
}
|
|
|
|
private void AvaloniaDynamicTextInputHandler_TextInput(object sender, string text)
|
|
{
|
|
Dispatcher.UIThread.InvokeAsync(() =>
|
|
{
|
|
if (_canProcessInput)
|
|
{
|
|
_hiddenTextBox.SendText(text);
|
|
}
|
|
});
|
|
}
|
|
|
|
private void AvaloniaDynamicTextInputHandler_KeyRelease(object sender, KeyEventArgs e)
|
|
{
|
|
var key = (HidKey)AvaloniaKeyboardMappingHelper.ToInputKey(e.Key);
|
|
|
|
if (!(KeyReleasedEvent?.Invoke(key)).GetValueOrDefault(true))
|
|
{
|
|
return;
|
|
}
|
|
|
|
e.RoutedEvent = OffscreenTextBox.GetKeyUpRoutedEvent();
|
|
|
|
Dispatcher.UIThread.InvokeAsync(() =>
|
|
{
|
|
if (_canProcessInput)
|
|
{
|
|
_hiddenTextBox.SendKeyUpEvent(e);
|
|
}
|
|
});
|
|
}
|
|
|
|
private void AvaloniaDynamicTextInputHandler_KeyPressed(object sender, KeyEventArgs e)
|
|
{
|
|
var key = (HidKey)AvaloniaKeyboardMappingHelper.ToInputKey(e.Key);
|
|
|
|
if (!(KeyPressedEvent?.Invoke(key)).GetValueOrDefault(true))
|
|
{
|
|
return;
|
|
}
|
|
|
|
e.RoutedEvent = OffscreenTextBox.GetKeyUpRoutedEvent();
|
|
|
|
Dispatcher.UIThread.InvokeAsync(() =>
|
|
{
|
|
if (_canProcessInput)
|
|
{
|
|
_hiddenTextBox.SendKeyDownEvent(e);
|
|
}
|
|
});
|
|
}
|
|
|
|
public bool TextProcessingEnabled
|
|
{
|
|
get
|
|
{
|
|
return Volatile.Read(ref _canProcessInput);
|
|
}
|
|
set
|
|
{
|
|
Volatile.Write(ref _canProcessInput, value);
|
|
}
|
|
}
|
|
|
|
public event DynamicTextChangedHandler TextChangedEvent;
|
|
public event KeyPressedHandler KeyPressedEvent;
|
|
public event KeyReleasedHandler KeyReleasedEvent;
|
|
|
|
public void Dispose()
|
|
{
|
|
(_parent.InputManager.KeyboardDriver as AvaloniaKeyboardDriver).KeyPressed -= AvaloniaDynamicTextInputHandler_KeyPressed;
|
|
(_parent.InputManager.KeyboardDriver as AvaloniaKeyboardDriver).KeyRelease -= AvaloniaDynamicTextInputHandler_KeyRelease;
|
|
(_parent.InputManager.KeyboardDriver as AvaloniaKeyboardDriver).TextInput -= AvaloniaDynamicTextInputHandler_TextInput;
|
|
|
|
_textChangedSubscription?.Dispose();
|
|
_selectionStartChangedSubscription?.Dispose();
|
|
_selectionEndtextChangedSubscription?.Dispose();
|
|
|
|
Dispatcher.UIThread.Post(() =>
|
|
{
|
|
_hiddenTextBox.Clear();
|
|
_parent.ViewModel.RendererHostControl.Focus();
|
|
|
|
_parent = null;
|
|
});
|
|
}
|
|
|
|
public void SetText(string text, int cursorBegin)
|
|
{
|
|
Dispatcher.UIThread.Post(() =>
|
|
{
|
|
_hiddenTextBox.Text = text;
|
|
_hiddenTextBox.CaretIndex = cursorBegin;
|
|
});
|
|
}
|
|
|
|
public void SetText(string text, int cursorBegin, int cursorEnd)
|
|
{
|
|
Dispatcher.UIThread.Post(() =>
|
|
{
|
|
_hiddenTextBox.Text = text;
|
|
_hiddenTextBox.SelectionStart = cursorBegin;
|
|
_hiddenTextBox.SelectionEnd = cursorEnd;
|
|
});
|
|
}
|
|
}
|
|
}
|