Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-05 23:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #110044 from timothyqiu/theme-type-name-validation

Browse Source 
Validate theme type name input in Add Theme Type dialog
This commit is contained in:
Thaddeus Crews
2025-08-29 12:00:44 -05:00
parent b0da1c77e4 e5373c5cb0
commit 825ef2387f
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scene/resources/theme.cpp
View File

@@ -176,8 +176,10 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
// Static helpers.
bool Theme::is_valid_type_name(const String &p_name) {
for (int i = 0; i < p_name.length(); i++) {
if (!is_ascii_identifier_char(p_name[i])) {
int len = p_name.length();
const char32_t *str = p_name.ptr();
for (int i = 0; i < len; i++) {
if (!is_ascii_identifier_char(str[i])) {
return false;
}
}
@@ -188,14 +190,28 @@ bool Theme::is_valid_item_name(const String &p_name) {
if (p_name.is_empty()) {
return false;
}
for (int i = 0; i < p_name.length(); i++) {
if (!is_ascii_identifier_char(p_name[i])) {
int len = p_name.length();
const char32_t *str = p_name.ptr();
for (int i = 0; i < len; i++) {
if (!is_ascii_identifier_char(str[i])) {
return false;
}
}
return true;
}
String Theme::validate_type_name(const String &p_name) {
String type_name = p_name.strip_edges();
int len = type_name.length();
char32_t *buffer = type_name.ptrw();
for (int i = 0; i < len; i++) {
if (!is_ascii_identifier_char(buffer[i])) {
buffer[i] = '_';
}
}
return type_name;
}
// Fallback values for theme item types, configurable per theme.
void Theme::set_default_base_scale(float p_base_scale) {
if (default_base_scale == p_base_scale) {

1
scene/resources/theme.h
View File

@@ -116,6 +116,7 @@ protected:
public:
static bool is_valid_type_name(const String &p_name);
static bool is_valid_item_name(const String &p_name);
static String validate_type_name(const String &p_name);
void set_default_base_scale(float p_base_scale);
float get_default_base_scale() const;