maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix non-valid characters for input_action

Browse source 
Add a new function to check action names, `_validate_action_name`, in
the spirit of `_valprop`. Offending characters include non-printable
ascii, and `\/=:"`. Also set only one text for the UI message.

(cherry picked from commit da6c07698f)
This commit is contained in:
robfram 2018-03-13 19:36:36 +01:00 committed by Hein-Pieter van Braam
parent 141e389c3f
commit fa831f0224
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editor/project_settings_editor.cpp
View file

@ -115,6 +115,15 @@ void ProjectSettingsEditor::_notification(int p_what) {
}
}
static bool _validate_action_name(const String &p_name) {
const CharType *cstr = p_name.c_str();
for (int i = 0; cstr[i]; i++)
if (cstr[i] == '/' || cstr[i] == ':' || cstr[i] == '"' ||
cstr[i] == '=' || cstr[i] == '\\' || cstr[i] < 32)
return false;
return true;
}
void ProjectSettingsEditor::_action_selected() {
TreeItem *ti = input_editor->get_selected();
@ -137,12 +146,12 @@ void ProjectSettingsEditor::_action_edited() {
if (new_name == old_name)
return;
if (new_name.find("/") != -1 || new_name.find(":") != -1 || new_name.find("\"") != -1 || new_name == "") {
if (new_name == "" || !_validate_action_name(new_name)) {
ti->set_text(0, old_name);
add_at = "input/" + old_name;
message->set_text(TTR("Invalid action (anything goes but '/', ':' or '\"')."));
message->set_text(TTR("Invalid action name. it cannot be empty nor contain '/', ':', '=', '\\' or '\"'"));
message->popup_centered(Size2(300, 100) * EDSCALE);
return;
}
@ -830,9 +839,9 @@ void ProjectSettingsEditor::_action_check(String p_action) {
action_add->set_disabled(true);
} else {
if (p_action.find("/") != -1 || p_action.find(":") != -1 || p_action.find("\"") != -1) {
if (!_validate_action_name(p_action)) {
action_add_error->set_text(TTR("Can't contain '/', ':' or '\"'"));
action_add_error->set_text(TTR("Invalid action name. it cannot be empty nor contain '/', ':', '=', '\\' or '\"'"));
action_add_error->show();
action_add->set_disabled(true);
return;