mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-08-18 14:48:44 +02:00
* ava: Remove unused doWhileDeferred parameters * ava: Minimally improve swkbd dialog It's currently impossible to get the dialog to redirect focus to the InputBox. * ava: Fix nca extraction dialog never closing Also contains some minor cleanup
148 lines
4.9 KiB
C#
148 lines
4.9 KiB
C#
using Avalonia;
|
|
using Avalonia.Controls;
|
|
using Avalonia.Input;
|
|
using Avalonia.Interactivity;
|
|
using Avalonia.Media;
|
|
using FluentAvalonia.Core;
|
|
using FluentAvalonia.UI.Controls;
|
|
using Ryujinx.Ava.Common.Locale;
|
|
using Ryujinx.Ava.UI.Helpers;
|
|
using Ryujinx.Ava.UI.Windows;
|
|
using Ryujinx.HLE.HOS.Applets;
|
|
using System;
|
|
using System.Threading.Tasks;
|
|
|
|
namespace Ryujinx.Ava.UI.Controls
|
|
{
|
|
internal partial class SwkbdAppletDialog : UserControl
|
|
{
|
|
private Predicate<int> _checkLength;
|
|
private int _inputMax;
|
|
private int _inputMin;
|
|
private string _placeholder;
|
|
|
|
private ContentDialog _host;
|
|
|
|
public SwkbdAppletDialog(string mainText, string secondaryText, string placeholder, string message)
|
|
{
|
|
MainText = mainText;
|
|
SecondaryText = secondaryText;
|
|
Message = message ?? "";
|
|
DataContext = this;
|
|
_placeholder = placeholder;
|
|
InitializeComponent();
|
|
|
|
Input.Watermark = _placeholder;
|
|
|
|
Input.AddHandler(TextInputEvent, Message_TextInput, RoutingStrategies.Tunnel, true);
|
|
|
|
SetInputLengthValidation(0, int.MaxValue); // Disable by default.
|
|
}
|
|
|
|
public SwkbdAppletDialog()
|
|
{
|
|
DataContext = this;
|
|
InitializeComponent();
|
|
}
|
|
|
|
protected override void OnGotFocus(GotFocusEventArgs e)
|
|
{
|
|
// FIXME: This does not work. Might be a bug in Avalonia with DialogHost
|
|
// Currently focus will be redirected to the overlay window instead.
|
|
Input.Focus();
|
|
}
|
|
|
|
public string Message { get; set; } = "";
|
|
public string MainText { get; set; } = "";
|
|
public string SecondaryText { get; set; } = "";
|
|
|
|
public static async Task<(UserResult Result, string Input)> ShowInputDialog(StyleableWindow window, string title, SoftwareKeyboardUiArgs args)
|
|
{
|
|
ContentDialog contentDialog = new ContentDialog();
|
|
|
|
UserResult result = UserResult.Cancel;
|
|
|
|
SwkbdAppletDialog content = new SwkbdAppletDialog(args.HeaderText, args.SubtitleText, args.GuideText, args.InitialText);
|
|
|
|
string input = string.Empty;
|
|
|
|
content.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
|
|
|
|
content._host = contentDialog;
|
|
contentDialog.Title = title;
|
|
contentDialog.PrimaryButtonText = args.SubmitText;
|
|
contentDialog.IsPrimaryButtonEnabled = content._checkLength(content.Message.Length);
|
|
contentDialog.SecondaryButtonText = "";
|
|
contentDialog.CloseButtonText = LocaleManager.Instance[LocaleKeys.InputDialogCancel];
|
|
contentDialog.Content = content;
|
|
|
|
TypedEventHandler<ContentDialog, ContentDialogClosedEventArgs> handler = (sender, eventArgs) =>
|
|
{
|
|
if (eventArgs.Result == ContentDialogResult.Primary)
|
|
{
|
|
result = UserResult.Ok;
|
|
input = content.Input.Text;
|
|
}
|
|
};
|
|
contentDialog.Closed += handler;
|
|
|
|
await ContentDialogHelper.ShowAsync(contentDialog);
|
|
|
|
return (result, input);
|
|
}
|
|
|
|
public void SetInputLengthValidation(int min, int max)
|
|
{
|
|
_inputMin = Math.Min(min, max);
|
|
_inputMax = Math.Max(min, max);
|
|
|
|
Error.IsVisible = false;
|
|
Error.FontStyle = FontStyle.Italic;
|
|
|
|
if (_inputMin <= 0 && _inputMax == int.MaxValue) // Disable.
|
|
{
|
|
Error.IsVisible = false;
|
|
|
|
_checkLength = length => true;
|
|
}
|
|
else if (_inputMin > 0 && _inputMax == int.MaxValue)
|
|
{
|
|
Error.IsVisible = true;
|
|
|
|
Error.Text = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SwkbdMinCharacters, _inputMin);
|
|
|
|
_checkLength = length => _inputMin <= length;
|
|
}
|
|
else
|
|
{
|
|
Error.IsVisible = true;
|
|
|
|
Error.Text = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SwkbdMinRangeCharacters, _inputMin, _inputMax);
|
|
|
|
_checkLength = length => _inputMin <= length && length <= _inputMax;
|
|
}
|
|
|
|
Message_TextInput(this, new TextInputEventArgs());
|
|
}
|
|
|
|
private void Message_TextInput(object sender, TextInputEventArgs e)
|
|
{
|
|
if (_host != null)
|
|
{
|
|
_host.IsPrimaryButtonEnabled = _checkLength(Message.Length);
|
|
}
|
|
}
|
|
|
|
private void Message_KeyUp(object sender, KeyEventArgs e)
|
|
{
|
|
if (e.Key == Key.Enter && _host.IsPrimaryButtonEnabled)
|
|
{
|
|
_host.Hide(ContentDialogResult.Primary);
|
|
}
|
|
else
|
|
{
|
|
_host.IsPrimaryButtonEnabled = _checkLength(Message.Length);
|
|
}
|
|
}
|
|
}
|
|
} |