diff options
Diffstat (limited to 'editor/debugger/editor_debugger_inspector.cpp')
-rw-r--r-- | editor/debugger/editor_debugger_inspector.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/editor/debugger/editor_debugger_inspector.cpp b/editor/debugger/editor_debugger_inspector.cpp index 00ed2bbc4c..125439d09b 100644 --- a/editor/debugger/editor_debugger_inspector.cpp +++ b/editor/debugger/editor_debugger_inspector.cpp @@ -36,9 +36,9 @@ #include "scene/debugger/scene_debugger.h" bool EditorDebuggerRemoteObject::_set(const StringName &p_name, const Variant &p_value) { - - if (!editable || !prop_values.has(p_name) || String(p_name).begins_with("Constants/")) + if (!editable || !prop_values.has(p_name) || String(p_name).begins_with("Constants/")) { return false; + } prop_values[p_name] = p_value; emit_signal("value_edited", remote_object_id, p_name, p_value); @@ -46,16 +46,15 @@ bool EditorDebuggerRemoteObject::_set(const StringName &p_name, const Variant &p } bool EditorDebuggerRemoteObject::_get(const StringName &p_name, Variant &r_ret) const { - - if (!prop_values.has(p_name)) + if (!prop_values.has(p_name)) { return false; + } r_ret = prop_values[p_name]; return true; } void EditorDebuggerRemoteObject::_get_property_list(List<PropertyInfo> *p_list) const { - p_list->clear(); //sorry, no want category for (const List<PropertyInfo>::Element *E = prop_list.front(); E; E = E->next()) { p_list->push_back(E->get()); @@ -63,10 +62,11 @@ void EditorDebuggerRemoteObject::_get_property_list(List<PropertyInfo> *p_list) } String EditorDebuggerRemoteObject::get_title() { - if (remote_object_id.is_valid()) + if (remote_object_id.is_valid()) { return TTR("Remote ") + String(type_name) + ": " + itos(remote_object_id); - else + } else { return "<null>"; + } } Variant EditorDebuggerRemoteObject::get_variant(const StringName &p_name) { @@ -76,7 +76,6 @@ Variant EditorDebuggerRemoteObject::get_variant(const StringName &p_name) { } void EditorDebuggerRemoteObject::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_title"), &EditorDebuggerRemoteObject::get_title); ClassDB::bind_method(D_METHOD("get_variant"), &EditorDebuggerRemoteObject::get_variant); ClassDB::bind_method(D_METHOD("clear"), &EditorDebuggerRemoteObject::clear); @@ -115,12 +114,10 @@ void EditorDebuggerInspector::_notification(int p_what) { } void EditorDebuggerInspector::_object_edited(ObjectID p_id, const String &p_prop, const Variant &p_value) { - emit_signal("object_edited", p_id, p_prop, p_value); } void EditorDebuggerInspector::_object_selected(ObjectID p_object) { - emit_signal("object_selected", p_object); } @@ -147,7 +144,6 @@ ObjectID EditorDebuggerInspector::add_object(const Array &p_arr) { int new_props_added = 0; Set<String> changed; for (int i = 0; i < obj.properties.size(); i++) { - PropertyInfo &pinfo = obj.properties[i].first; Variant &var = obj.properties[i].second; @@ -187,7 +183,6 @@ ObjectID EditorDebuggerInspector::add_object(const Array &p_arr) { new_props_added++; debugObj->prop_values[pinfo.name] = var; } else { - if (bool(Variant::evaluate(Variant::OP_NOT_EQUAL, debugObj->prop_values[pinfo.name], var))) { debugObj->prop_values[pinfo.name] = var; changed.insert(pinfo.name); @@ -219,13 +214,13 @@ void EditorDebuggerInspector::clear_cache() { } Object *EditorDebuggerInspector::get_object(ObjectID p_id) { - if (remote_objects.has(p_id)) + if (remote_objects.has(p_id)) { return remote_objects[p_id]; + } return nullptr; } void EditorDebuggerInspector::add_stack_variable(const Array &p_array) { - DebuggerMarshalls::ScriptStackVariable var; var.deserialize(p_array); String n = var.name; |