midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5086 from zhaowenlan1779/swkbd-digit-fix

Browse Source 
swkbd: Fix digit filter
This commit is contained in:
Pengfei Zhu 2020-02-05 00:41:27 +08:00 committed by GitHub
commit 821a35bd2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/frontend/applets/swkbd.cpp
View File

@ -15,9 +15,9 @@ namespace Frontend {
ValidationError SoftwareKeyboard::ValidateFilters(const std::string& input) const { ValidationError SoftwareKeyboard::ValidateFilters(const std::string& input) const {
if (config.filters.prevent_digit) { if (config.filters.prevent_digit) {
if (std::any_of(input.begin(), input.end(), if (std::count_if(input.begin(), input.end(),
[](unsigned char c) { return std::isdigit(c); })) { [](unsigned char c) { return std::isdigit(c); }) > config.max_digits) {
return ValidationError::DigitNotAllowed; return ValidationError::MaxDigitsExceeded;
} }
} }
if (config.filters.prevent_at) { if (config.filters.prevent_at) {

5
src/core/frontend/applets/swkbd.h
View File

@ -47,8 +47,7 @@ struct KeyboardConfig {
bool has_custom_button_text; /// If true, use the button_text instead bool has_custom_button_text; /// If true, use the button_text instead
std::vector<std::string> button_text; /// Contains the button text that the caller provides std::vector<std::string> button_text; /// Contains the button text that the caller provides
struct Filters { struct Filters {
bool prevent_digit; /// Disallow the use of more than a certain number of digits bool prevent_digit; /// Limit maximum digit count to max_digits
/// TODO: how many is a certain number
bool prevent_at; /// Disallow the use of the @ sign. bool prevent_at; /// Disallow the use of the @ sign.
bool prevent_percent; /// Disallow the use of the % sign. bool prevent_percent; /// Disallow the use of the % sign.
bool prevent_backslash; /// Disallow the use of the \ sign. bool prevent_backslash; /// Disallow the use of the \ sign.
@ -68,7 +67,7 @@ enum class ValidationError {
// Button Selection // Button Selection
ButtonOutOfRange, ButtonOutOfRange,
// Configured Filters // Configured Filters
DigitNotAllowed, MaxDigitsExceeded,
AtSignNotAllowed, AtSignNotAllowed,
PercentNotAllowed, PercentNotAllowed,
BackslashNotAllowed, BackslashNotAllowed,