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

19
editor/scene/gui/theme_editor_plugin.cpp
View File

@@ -1334,11 +1334,7 @@ void ThemeItemEditorDialog::_edited_type_edited() {
TreeItem *edited_item = edit_type_list->get_selected();
const String old_type_name = edited_item->get_metadata(0);
String new_type_name = edited_item->get_text(0).strip_edges();
if (!new_type_name.is_empty()) { // The type name can be empty, unlike the item name.
new_type_name = new_type_name.validate_ascii_identifier();
}
const String &new_type_name = Theme::validate_type_name(edited_item->get_text(0));
if (old_type_name == new_type_name) {
edited_item->set_text(0, old_type_name);
return;
@@ -1585,10 +1581,7 @@ void ThemeItemEditorDialog::_item_tree_button_pressed(Object *p_item, int p_colu
}
void ThemeItemEditorDialog::_add_theme_type() {
String new_type_name = edit_add_type_value->get_text().strip_edges();
if (!new_type_name.is_empty()) { // The type name can be empty, unlike the item name.
new_type_name = new_type_name.validate_ascii_identifier();
}
const String &new_type_name = Theme::validate_type_name(edit_add_type_value->get_text());
edit_add_type_value->clear();
EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
@@ -2254,7 +2247,7 @@ void ThemeTypeDialog::_add_type_options_cbk(int p_index) {
}
void ThemeTypeDialog::_add_type_dialog_entered(const String &p_value) {
_add_type_selected(p_value.strip_edges());
_add_type_selected(Theme::validate_type_name(p_value));
}
void ThemeTypeDialog::_add_type_dialog_activated(int p_index) {
@@ -2890,11 +2883,7 @@ void ThemeTypeEditor::_rename_type_button_cbk() {
}
void ThemeTypeEditor::_theme_type_rename_dialog_confirmed() {
String new_type_name = theme_type_rename_line_edit->get_text().strip_edges();
if (!new_type_name.is_empty()) { // The type name can be empty, unlike the item name.
new_type_name = new_type_name.validate_ascii_identifier();
}
const String &new_type_name = Theme::validate_type_name(theme_type_rename_line_edit->get_text());
if (edited_type == new_type_name) {
return;
}