diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-09-07 11:59:46 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 11:59:46 -0300 |
| commit | 93aa158b5e1b3b11c3482834504e791c3898baf0 (patch) | |
| tree | dd0de472b6a31e4878a765025990d08977619320 /core/object/object.h | |
| parent | 88c3e3180a52b2460429dfc031555392394fd97d (diff) | |
| parent | 4bd7700e89f4476a3b2c76e7bed4263a111b3c09 (diff) | |
Merge pull request #52277 from groud/implement_array_property_hint
Implement properties arrays in the Inspector.
Diffstat (limited to 'core/object/object.h')
| -rw-r--r-- | core/object/object.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/object/object.h b/core/object/object.h index 1838e7eb3d..a44d921bff 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -132,7 +132,8 @@ enum PropertyUsageFlags { PROPERTY_USAGE_DEFERRED_SET_RESOURCE = 1 << 26, // when loading, the resource for this property can be set at the end of loading PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT = 1 << 27, // For Object properties, instantiate them when creating in editor. PROPERTY_USAGE_EDITOR_BASIC_SETTING = 1 << 28, //for project or editor settings, show when basic settings are selected - PROPERTY_USAGE_READ_ONLY = 1 << 29, + PROPERTY_USAGE_READ_ONLY = 1 << 29, // Mark a property as read-only in the inspector. + PROPERTY_USAGE_ARRAY = 1 << 30, // Used in the inspector to group properties as elements of an array. PROPERTY_USAGE_DEFAULT = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_NETWORK, PROPERTY_USAGE_DEFAULT_INTL = PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_NETWORK | PROPERTY_USAGE_INTERNATIONALIZED, @@ -147,6 +148,10 @@ enum PropertyUsageFlags { #define ADD_SUBGROUP(m_name, m_prefix) ::ClassDB::add_property_subgroup(get_class_static(), m_name, m_prefix) #define ADD_LINKED_PROPERTY(m_property, m_linked_property) ::ClassDB::add_linked_property(get_class_static(), m_property, m_linked_property) +#define ADD_ARRAY_COUNT(m_label, m_count_property, m_count_property_setter, m_count_property_getter, m_prefix) ClassDB::add_property_array_count(get_class_static(), m_label, m_count_property, _scs_create(m_count_property_setter), _scs_create(m_count_property_getter), m_prefix) +#define ADD_ARRAY_COUNT_WITH_USAGE_FLAGS(m_label, m_count_property, m_count_property_setter, m_count_property_getter, m_prefix, m_property_usage_flags) ClassDB::add_property_array_count(get_class_static(), m_label, m_count_property, _scs_create(m_count_property_setter), _scs_create(m_count_property_getter), m_prefix, m_property_usage_flags) +#define ADD_ARRAY(m_array_path, m_prefix) ClassDB::add_property_array(get_class_static(), m_array_path, m_prefix) + struct PropertyInfo { Variant::Type type = Variant::NIL; String name; |