asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #70540 from vaartis/multiline-arrays-dictionaries

Browse source 
Implement export_multiline support for Array[String] and Dictionary
This commit is contained in:
Rémi Verschelde 2023-01-13 18:01:55 +01:00
commit 4c2dea108e
No known key found for this signature in database
GPG key ID: C3336907360768E1
4 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
editor/editor_properties.cpp
View file

@ -4584,6 +4584,7 @@ EditorProperty *EditorInspectorDefaultPlugin::get_editor_for_property(Object *p_
return editor; return editor;
} else { } else {
EditorPropertyDictionary *editor = memnew(EditorPropertyDictionary); EditorPropertyDictionary *editor = memnew(EditorPropertyDictionary);
editor->setup(p_hint);
return editor; return editor;
} }
} break; } break;

12
editor/editor_properties_array_dict.cpp
View file

@ -818,6 +818,10 @@ void EditorPropertyDictionary::_change_type_menu(int p_index) {
update_property(); update_property();
} }
void EditorPropertyDictionary::setup(PropertyHint p_hint) {
property_hint = p_hint;
}
void EditorPropertyDictionary::update_property() { void EditorPropertyDictionary::update_property() {
Variant updated_val = get_edited_object()->get(get_edited_property()); Variant updated_val = get_edited_object()->get(get_edited_property());
@ -929,7 +933,13 @@ void EditorPropertyDictionary::update_property() {
prop = editor; prop = editor;
} break; } break;
case Variant::STRING: { case Variant::STRING: {
prop = memnew(EditorPropertyText); if (i != amount && property_hint == PROPERTY_HINT_MULTILINE_TEXT) {
// If this is NOT the new key field and there's a multiline hint,
// show the field as multiline
prop = memnew(EditorPropertyMultilineText);
} else {
prop = memnew(EditorPropertyText);
}
} break; } break;

2
editor/editor_properties_array_dict.h
View file

@ -154,6 +154,7 @@ class EditorPropertyDictionary : public EditorProperty {
EditorSpinSlider *size_sliderv = nullptr; EditorSpinSlider *size_sliderv = nullptr;
Button *button_add_item = nullptr; Button *button_add_item = nullptr;
EditorPaginator *paginator = nullptr; EditorPaginator *paginator = nullptr;
PropertyHint property_hint;
void _page_changed(int p_page); void _page_changed(int p_page);
void _edit_pressed(); void _edit_pressed();
@ -169,6 +170,7 @@ protected:
void _notification(int p_what); void _notification(int p_what);
public: public:
void setup(PropertyHint p_hint);
virtual void update_property() override; virtual void update_property() override;
EditorPropertyDictionary(); EditorPropertyDictionary();
}; };

20
modules/gdscript/gdscript_parser.cpp
View file

@ -3794,6 +3794,26 @@ bool GDScriptParser::export_annotations(const AnnotationNode *p_annotation, Node
variable->export_info.type = Variant::INT; variable->export_info.type = Variant::INT;
} }
} }
if (p_annotation->name == SNAME("@export_multiline")) {
if (export_type.builtin_type == Variant::ARRAY && export_type.has_container_element_type()) {
DataType inner_type = export_type.get_container_element_type();
if (inner_type.builtin_type != Variant::STRING) {
push_error(vformat(R"("%s" annotation on arrays requires a string type but type "%s" was given instead.)", p_annotation->name.operator String(), inner_type.to_string()), variable);
return false;
}
String hint_prefix = itos(inner_type.builtin_type) + "/" + itos(variable->export_info.hint);
variable->export_info.hint = PROPERTY_HINT_TYPE_STRING;
variable->export_info.hint_string = hint_prefix + ":" + variable->export_info.hint_string;
variable->export_info.type = Variant::ARRAY;
return true;
} else if (export_type.builtin_type == Variant::DICTIONARY) {
variable->export_info.type = Variant::DICTIONARY;
return true;
}
}
if (p_annotation->name == SNAME("@export")) { if (p_annotation->name == SNAME("@export")) {
if (variable->datatype_specifier == nullptr && variable->initializer == nullptr) { if (variable->datatype_specifier == nullptr && variable->initializer == nullptr) {