diff options
Diffstat (limited to 'editor/editor_inspector.h')
| -rw-r--r-- | editor/editor_inspector.h | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 44cc56b543..0550509ba2 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -48,7 +48,8 @@ public: class EditorProperty : public Container { - GDCLASS(EditorProperty, Container) + GDCLASS(EditorProperty, Container); + private: String label; int text_size; @@ -102,6 +103,8 @@ protected: void _gui_input(const Ref<InputEvent> &p_event); public: + void emit_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field = StringName(), bool p_changing = false); + virtual Size2 get_minimum_size() const; void set_label(const String &p_label); @@ -165,7 +168,7 @@ public: }; class EditorInspectorPlugin : public Reference { - GDCLASS(EditorInspectorPlugin, Reference) + GDCLASS(EditorInspectorPlugin, Reference); friend class EditorInspector; struct AddedEditor { @@ -279,7 +282,7 @@ class EditorInspector : public ScrollContainer { bool update_all_pending; bool read_only; bool keying; - bool use_sub_inspector_bg; + bool sub_inspector; float refresh_countdown; bool update_tree_pending; @@ -299,8 +302,8 @@ class EditorInspector : public ScrollContainer { void _edit_set(const String &p_name, const Variant &p_value, bool p_refresh_all, const String &p_changed_field); - void _property_changed(const String &p_path, const Variant &p_value, bool changing = false); - void _property_changed_update_all(const String &p_path, const Variant &p_value); + void _property_changed(const String &p_path, const Variant &p_value, const String &p_name = "", bool changing = false); + void _property_changed_update_all(const String &p_path, const Variant &p_value, const String &p_name = "", bool p_changing = false); void _multiple_properties_changed(Vector<String> p_paths, Array p_values); void _property_keyed(const String &p_path, bool p_advance); void _property_keyed_with_value(const String &p_path, const Variant &p_value, bool p_advance); @@ -321,6 +324,10 @@ class EditorInspector : public ScrollContainer { void _vscroll_changed(double); + void _feature_profile_changed(); + + bool _is_property_disabled_by_feature_profile(const StringName &p_property); + protected: static void _bind_methods(); void _notification(int p_what); @@ -373,7 +380,7 @@ public: void set_object_class(const String &p_class); String get_object_class() const; - void set_use_sub_inspector_bg(bool p_enable); + void set_sub_inspector(bool p_enable); EditorInspector(); }; |