diff options
| author | Rémi Verschelde | 2017-01-11 14:46:38 +0100 |
|---|---|---|
| committer | GitHub | 2017-01-11 14:46:38 +0100 |
| commit | 42802ab9dc4c688f0300c51859cae1fe3c18017d (patch) | |
| tree | b2022cf7ad646ae9130b8f6d0146de81968d7b1b /tools/editor/array_property_edit.h | |
| parent | 34c33648f236b50eb9a68b7a11ee811f979caa3f (diff) | |
| parent | 713f1451b95c7dd29079496186fb157ac0a11b40 (diff) | |
| download | godot-42802ab9dc4c688f0300c51859cae1fe3c18017d.tar.gz godot-42802ab9dc4c688f0300c51859cae1fe3c18017d.tar.zst godot-42802ab9dc4c688f0300c51859cae1fe3c18017d.zip | |
Merge pull request #6930 from bojidar-bg/gdscript-export-array-hint
Allow typing hints for Array class (in GDScript and Inspector)
Diffstat (limited to 'tools/editor/array_property_edit.h')
| -rw-r--r-- | tools/editor/array_property_edit.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/editor/array_property_edit.h b/tools/editor/array_property_edit.h index f904f3c15..6ca700bf8 100644 --- a/tools/editor/array_property_edit.h +++ b/tools/editor/array_property_edit.h @@ -39,6 +39,9 @@ class ArrayPropertyEdit : public Reference { ObjectID obj; StringName property; String vtypes; + String subtype_hint_string; + PropertyHint subtype_hint; + Variant::Type subtype; Variant get_array() const; Variant::Type default_type; @@ -56,7 +59,7 @@ protected: public: - void edit(Object* p_obj, const StringName& p_prop, Variant::Type p_deftype); + void edit(Object* p_obj, const StringName& p_prop, const String& p_hint_string, Variant::Type p_deftype); Node *get_node(); |
