1 files changed, 55 insertions, 78 deletions

diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index d6f337cc20..10c9974cdd 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -128,18 +128,22 @@ void EditorProperty::_notification(int p_what) {
 
 				bottom_rect = Rect2(m, rect.size.height + get_constant("vseparation", "Tree"), size.width - m, bottom_editor->get_combined_minimum_size().height);
 			}
-		}
 
-		if (keying) {
-			Ref<Texture> key;
+			if (keying) {
+				Ref<Texture> key;
 
-			if (use_keying_next()) {
-				key = get_icon("KeyNext", "EditorIcons");
-			} else {
-				key = get_icon("Key", "EditorIcons");
-			}
+				if (use_keying_next()) {
+					key = get_icon("KeyNext", "EditorIcons");
+				} else {
+					key = get_icon("Key", "EditorIcons");
+				}
+
+				rect.size.x -= key->get_width() + get_constant("hseparator", "Tree");
 
-			rect.size.x -= key->get_width() + get_constant("hseparator", "Tree");
+				if (no_children) {
+					text_size -= key->get_width() + 4 * EDSCALE;
+				}
+			}
 		}
 
 		//set children
@@ -297,16 +301,12 @@ bool EditorProperty::is_read_only() const {
 	return read_only;
 }
 
-bool EditorProperty::_might_be_in_instance() {
-
-	if (!object)
-		return false;
-
-	Node *node = Object::cast_to<Node>(object);
+bool EditorPropertyRevert::may_node_be_in_instance(Node *p_node) {
 
 	Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
 
 	bool might_be = false;
+	Node *node = p_node;
 
 	while (node) {
 
@@ -328,13 +328,9 @@ bool EditorProperty::_might_be_in_instance() {
 	return might_be; // or might not be
 }
 
-bool EditorProperty::_get_instanced_node_original_property(const StringName &p_prop, Variant &value) {
-
-	Node *node = Object::cast_to<Node>(object);
-
-	if (!node)
-		return false;
+bool EditorPropertyRevert::get_instanced_node_original_property(Node *p_node, const StringName &p_prop, Variant &value) {
 
+	Node *node = p_node;
 	Node *orig = node;
 
 	Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
@@ -376,7 +372,7 @@ bool EditorProperty::_get_instanced_node_original_property(const StringName &p_p
 
 	if (!found) {
 		//if not found, try default class value
-		Variant attempt = ClassDB::class_get_default_property_value(object->get_class_name(), property);
+		Variant attempt = ClassDB::class_get_default_property_value(node->get_class_name(), p_prop);
 		if (attempt.get_type() != Variant::NIL) {
 			found = true;
 			value = attempt;
@@ -386,14 +382,14 @@ bool EditorProperty::_get_instanced_node_original_property(const StringName &p_p
 	return found;
 }
 
-bool EditorProperty::_is_property_different(const Variant &p_current, const Variant &p_orig) {
+bool EditorPropertyRevert::is_node_property_different(Node *p_node, const Variant &p_current, const Variant &p_orig) {
 
 	// this is a pretty difficult function, because a property may not be saved but may have
 	// the flag to not save if one or if zero
 
 	//make sure there is an actual state
 	{
-		Node *node = Object::cast_to<Node>(object);
+		Node *node = p_node;
 		if (!node)
 			return false;
 
@@ -435,46 +431,55 @@ bool EditorProperty::_is_property_different(const Variant &p_current, const Vari
 	return bool(Variant::evaluate(Variant::OP_NOT_EQUAL, p_current, p_orig));
 }
 
-void EditorProperty::update_reload_status() {
+bool EditorPropertyRevert::can_property_revert(Object *p_object, const StringName &p_property) {
 
-	if (property == StringName())
-		return; //no property, so nothing to do
+	bool has_revert = false;
 
-	bool has_reload = false;
+	Node *node = Object::cast_to<Node>(p_object);
 
-	if (_might_be_in_instance()) {
+	if (node && EditorPropertyRevert::may_node_be_in_instance(node)) {
 		//check for difference including instantiation
 		Variant vorig;
-		if (_get_instanced_node_original_property(property, vorig)) {
-			Variant v = object->get(property);
+		if (EditorPropertyRevert::get_instanced_node_original_property(node, p_property, vorig)) {
+			Variant v = p_object->get(p_property);
 
-			if (_is_property_different(v, vorig)) {
-				has_reload = true;
+			if (EditorPropertyRevert::is_node_property_different(node, v, vorig)) {
+				has_revert = true;
 			}
 		}
 	} else {
 		//check for difference against default class value instead
-		Variant default_value = ClassDB::class_get_default_property_value(object->get_class_name(), property);
-		if (default_value != Variant() && default_value != object->get(property)) {
-			has_reload = true;
+		Variant default_value = ClassDB::class_get_default_property_value(p_object->get_class_name(), p_property);
+		if (default_value != Variant() && default_value != p_object->get(p_property)) {
+			has_revert = true;
 		}
 	}
 
-	if (object->call("property_can_revert", property).operator bool()) {
+	if (p_object->call("property_can_revert", p_property).operator bool()) {
 
-		has_reload = true;
+		has_revert = true;
 	}
 
-	if (!has_reload && !object->get_script().is_null()) {
-		Ref<Script> scr = object->get_script();
+	if (!has_revert && !p_object->get_script().is_null()) {
+		Ref<Script> scr = p_object->get_script();
 		Variant orig_value;
-		if (scr->get_property_default_value(property, orig_value)) {
-			if (orig_value != object->get(property)) {
-				has_reload = true;
+		if (scr->get_property_default_value(p_property, orig_value)) {
+			if (orig_value != p_object->get(p_property)) {
+				has_revert = true;
 			}
 		}
 	}
 
+	return has_revert;
+}
+
+void EditorProperty::update_reload_status() {
+
+	if (property == StringName())
+		return; //no property, so nothing to do
+
+	bool has_reload = EditorPropertyRevert::can_property_revert(object, property);
+
 	if (has_reload != can_revert) {
 		can_revert = has_reload;
 		update();
@@ -638,7 +643,8 @@ void EditorProperty::_gui_input(const Ref<InputEvent> &p_event) {
 
 			Variant vorig;
 
-			if (_might_be_in_instance() && _get_instanced_node_original_property(property, vorig)) {
+			Node *node = Object::cast_to<Node>(object);
+			if (node && EditorPropertyRevert::may_node_be_in_instance(node) && EditorPropertyRevert::get_instanced_node_original_property(node, property, vorig)) {
 
 				emit_signal("property_changed", property, vorig.duplicate(true));
 				update_property();
@@ -1153,6 +1159,11 @@ void EditorInspectorSection::_gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseButton> mb = p_event;
 	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) {
 
+		Ref<Font> font = get_font("font", "Tree");
+		if (mb->get_position().y > font->get_height()) { //clicked outside
+			return;
+		}
+
 		_test_unfold();
 
 		bool unfold = !object->editor_is_section_unfolded(section);
@@ -1375,28 +1386,6 @@ void EditorInspector::update_tree() {
 
 	//	TreeItem *current_category = NULL;
 
-	bool unfold_if_edited = false;
-
-	if (use_folding && auto_unfold_edited && get_tree()->get_edited_scene_root()) {
-		String path;
-		Node *node = Object::cast_to<Node>(object);
-		if (node) {
-			path = get_tree()->get_edited_scene_root()->get_filename();
-		}
-		Resource *res = Object::cast_to<Resource>(object);
-		if (res) {
-			if (res->get_path().is_resource_file()) {
-				path = res->get_path();
-			} else if (res->get_path().begins_with("res://")) { //internal resource
-				path = get_tree()->get_edited_scene_root()->get_filename();
-			}
-		}
-
-		if (!EditorNode::get_singleton()->get_editor_folding().has_folding_data(path)) {
-			unfold_if_edited = true;
-		}
-	}
-
 	String filter = search_box ? search_box->get_text() : "";
 	String group;
 	String group_base;
@@ -1716,13 +1705,6 @@ void EditorInspector::update_tree() {
 					if (current_selected && ep->property == current_selected) {
 						ep->select(current_focusable);
 					}
-
-					if (unfold_if_edited && ep->can_revert_to_default()) {
-						//if edited and there is a parent section, unfold it.
-						if (current_vbox && section_map.has(current_vbox)) {
-							section_map[current_vbox]->unfold();
-						}
-					}
 				}
 			}
 
@@ -2219,10 +2201,6 @@ String EditorInspector::get_object_class() const {
 	return object_class;
 }
 
-void EditorInspector::set_auto_unfold_edited(bool p_enable) {
-	auto_unfold_edited = p_enable;
-}
-
 void EditorInspector::_bind_methods() {
 
 	ClassDB::bind_method("_property_changed", &EditorInspector::_property_changed, DEFVAL(false));
@@ -2279,7 +2257,6 @@ EditorInspector::EditorInspector() {
 	set_process(true);
 	property_focusable = -1;
 	use_sub_inspector_bg = false;
-	auto_unfold_edited = false;
 
 	get_v_scrollbar()->connect("value_changed", this, "_vscroll_changed");
 	update_scroll_request = -1;