Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose "meta" to the Inspector #22642

Merged
merged 1 commit into from
Jul 19, 2019
+17 −14
Merged

Expose "meta" to the Inspector #22642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions core/object.cpp
View file
Original file line number Diff line number Diff line change
@@ -638,9 +638,12 @@ void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) cons
#endif
p_list->push_back(PropertyInfo(Variant::OBJECT, "script", PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_DEFAULT));
}
if (!metadata.empty()) {
p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL));
}

#ifdef TOOLS_ENABLED
p_list->push_back(PropertyInfo(Variant::NIL, "Metadata", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
#endif
p_list->push_back(PropertyInfo(Variant::DICTIONARY, "__meta__", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT));

if (script_instance && !p_reversed) {
p_list->push_back(PropertyInfo(Variant::NIL, "Script Variables", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY));
script_instance->get_property_list(p_list);
4 changes: 2 additions & 2 deletions editor/animation_track_editor.cpp
View file
Original file line number Diff line number Diff line change
@@ -47,15 +47,15 @@ class AnimationTrackKeyEdit : public Object {
bool setting;
bool hidden;

bool _hide_script_from_inspector() {
bool _hide_object_properties_from_inspector() {
return true;
}

static void _bind_methods() {

ClassDB::bind_method("_update_obj", &AnimationTrackKeyEdit::_update_obj);
ClassDB::bind_method("_key_ofs_changed", &AnimationTrackKeyEdit::_key_ofs_changed);
ClassDB::bind_method("_hide_script_from_inspector", &AnimationTrackKeyEdit::_hide_script_from_inspector);
ClassDB::bind_method("_hide_object_properties_from_inspector", &AnimationTrackKeyEdit::_hide_object_properties_from_inspector);
ClassDB::bind_method("get_root_path", &AnimationTrackKeyEdit::get_root_path);
}

8 changes: 4 additions & 4 deletions editor/editor_inspector.cpp
View file
Original file line number Diff line number Diff line change
@@ -1483,7 +1483,7 @@ void EditorInspector::update_tree() {
if (p.usage & PROPERTY_USAGE_HIGH_END_GFX && VS::get_singleton()->is_low_end())
continue; //do not show this property in low end gfx

if (p.name == "script" && (hide_script || bool(object->call("_hide_script_from_inspector")))) {
if ((hide_object_properties || bool(object->call("_hide_object_properties_from_inspector"))) && (p.name == "script" || p.name == "__meta__")) {
continue;
}

@@ -1810,8 +1810,8 @@ void EditorInspector::set_use_doc_hints(bool p_enable) {
use_doc_hints = p_enable;
update_tree();
}
void EditorInspector::set_hide_script(bool p_hide) {
hide_script = p_hide;
void EditorInspector::set_hide_object_properties(bool p_hide) {
hide_object_properties = p_hide;
update_tree();
}
void EditorInspector::set_use_filter(bool p_use) {
@@ -2240,7 +2240,7 @@ EditorInspector::EditorInspector() {
set_enable_v_scroll(true);

show_categories = false;
hide_script = true;
hide_object_properties = true;
use_doc_hints = false;
capitalize_paths = true;
use_filter = false;
4 changes: 2 additions & 2 deletions editor/editor_inspector.h
View file
Original file line number Diff line number Diff line change
@@ -269,7 +269,7 @@ class EditorInspector : public ScrollContainer {

LineEdit *search_box;
bool show_categories;
bool hide_script;
bool hide_object_properties;
bool use_doc_hints;
bool capitalize_paths;
bool use_filter;
@@ -353,7 +353,7 @@ class EditorInspector : public ScrollContainer {

void set_show_categories(bool p_show);
void set_use_doc_hints(bool p_enable);
void set_hide_script(bool p_hide);
void set_hide_object_properties(bool p_hide);

void set_use_filter(bool p_use);
void register_text_enter(Node *p_line_edit);
2 changes: 1 addition & 1 deletion editor/inspector_dock.cpp
View file
Original file line number Diff line number Diff line change
@@ -586,7 +586,7 @@ InspectorDock::InspectorDock(EditorNode *p_editor, EditorData &p_editor_data) {
inspector->set_show_categories(true);
inspector->set_v_size_flags(Control::SIZE_EXPAND_FILL);
inspector->set_use_doc_hints(true);
inspector->set_hide_script(false);
inspector->set_hide_object_properties(false);
inspector->set_enable_capitalize_paths(bool(EDITOR_GET("interface/inspector/capitalize_properties")));
inspector->set_use_folding(!bool(EDITOR_GET("interface/inspector/disable_folding")));
inspector->register_text_enter(search);
2 changes: 1 addition & 1 deletion editor/plugins/tile_set_editor_plugin.cpp
View file
Original file line number Diff line number Diff line change
@@ -2476,7 +2476,7 @@ void TilesetEditorContext::_get_property_list(List<PropertyInfo> *p_list) const

void TilesetEditorContext::_bind_methods() {

ClassDB::bind_method("_hide_script_from_inspector", &TilesetEditorContext::_hide_script_from_inspector);
ClassDB::bind_method("_hide_object_properties_from_inspector", &TilesetEditorContext::_hide_object_properties_from_inspector);
}

TilesetEditorContext::TilesetEditorContext(TileSetEditor *p_tileset_editor) {
2 changes: 1 addition & 1 deletion editor/plugins/tile_set_editor_plugin.h
View file
Original file line number Diff line number Diff line change
@@ -216,7 +216,7 @@ class TilesetEditorContext : public Object {
bool snap_options_visible;

public:
bool _hide_script_from_inspector() { return true; }
bool _hide_object_properties_from_inspector() { return true; }
void set_tileset(const Ref<TileSet> &p_tileset);

private: