diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2023-09-01 19:08:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-01 20:08:42 +0200 |
| commit | 12cbacffca7b04a7f377e8fdf09ce78445351913 (patch) | |
| tree | 9f924711b8a6b19cded897b660aefe17f54787af /src/Ryujinx.Ava | |
| parent | 437c78e19840a9f4a9fdb4e491a8214019c536fe (diff) | |
Fix numeric SWKB validation (#5627)
* Fix numeric swkbd validation
* GTK
Diffstat (limited to 'src/Ryujinx.Ava')
| -rw-r--r-- | src/Ryujinx.Ava/Assets/Locales/en_US.json | 2 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Ryujinx.Ava/Assets/Locales/en_US.json b/src/Ryujinx.Ava/Assets/Locales/en_US.json index efd3187a..35a69b8f 100644 --- a/src/Ryujinx.Ava/Assets/Locales/en_US.json +++ b/src/Ryujinx.Ava/Assets/Locales/en_US.json @@ -544,7 +544,7 @@ "SwkbdMinCharacters": "Must be at least {0} characters long", "SwkbdMinRangeCharacters": "Must be {0}-{1} characters long", "SoftwareKeyboard": "Software Keyboard", - "SoftwareKeyboardModeNumbersOnly": "Must be numbers only", + "SoftwareKeyboardModeNumeric": "Must be 0-9 or '.' only", "SoftwareKeyboardModeAlphabet": "Must be non CJK-characters only", "SoftwareKeyboardModeASCII": "Must be ASCII text only", "DialogControllerAppletMessagePlayerRange": "Application requests {0} player(s) with:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}Please open Settings and reconfigure Input now or press Close.", diff --git a/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs b/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs index 210fc9a2..5a4cd855 100644 --- a/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs +++ b/src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs @@ -136,10 +136,10 @@ namespace Ryujinx.Ava.UI.Controls string localeText; switch (mode) { - case KeyboardMode.NumbersOnly: - localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeNumbersOnly); + case KeyboardMode.Numeric: + localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeNumeric); validationInfoText = string.IsNullOrEmpty(validationInfoText) ? localeText : string.Join("\n", validationInfoText, localeText); - _checkInput = text => text.All(char.IsDigit); + _checkInput = text => text.All(NumericCharacterValidation.IsNumeric); break; case KeyboardMode.Alphabet: localeText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.SoftwareKeyboardModeAlphabet); |