diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-29 09:07:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 09:07:36 +0100 |
| commit | aac4cde229f9d4dc1fbc35955cf934a749cb9d95 (patch) | |
| tree | 196307aa844f2587ce6bcd536f8f5589e8638455 | |
| parent | 0f55d3767d03e81e6105185ffae0fae7260cd1e8 (diff) | |
| parent | 45c5a865c22a590913cf7e3ede2d53c85ab69116 (diff) | |
Merge pull request #13367 from Krakean/inspector_collapseexpand_corrections
Small corrections to Inspector collapse/expand feature
| -rw-r--r-- | editor/editor_node.cpp | 5 | ||||
| -rw-r--r-- | editor/property_editor.cpp | 5 | ||||
| -rw-r--r-- | editor/property_editor.h | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b5c7187b81..fbf6c86c35 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1475,7 +1475,6 @@ void EditorNode::_edit_current() { object_menu->set_disabled(true); bool capitalize = bool(EDITOR_DEF("interface/editor/capitalize_properties", true)); - bool expandall = bool(EDITOR_DEF("interface/editor/expand_all_properties", true)); bool is_resource = current_obj->is_class("Resource"); bool is_node = current_obj->is_class("Node"); resource_save_button->set_disabled(!is_resource); @@ -1547,10 +1546,6 @@ void EditorNode::_edit_current() { property_editor->set_enable_capitalize_paths(capitalize); } - if (property_editor->is_expand_all_properties_enabled() != expandall) { - property_editor->set_use_folding(expandall == false); - } - /* Take care of PLUGIN EDITOR */ EditorPlugin *main_plugin = editor_data.get_editor(current_obj); diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index d383e54f05..d573a44cdd 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -2665,12 +2665,12 @@ TreeItem *PropertyEditor::get_parent_node(String p_path, HashMap<String, TreeIte item->set_editable(1, false); item->set_selectable(1, subsection_selectable); - if (use_folding) { + if (use_folding || folding_behaviour != FB_UNDEFINED) { // Even if you disabled folding (expand all by default), you still can collapse all manually. if (!obj->editor_is_section_unfolded(p_path)) { updating_folding = true; if (folding_behaviour == FB_COLLAPSEALL) item->set_collapsed(true); - else if (folding_behaviour == FB_EXPANDALL) + else if (folding_behaviour == FB_EXPANDALL || is_expandall_enabled) item->set_collapsed(false); else item->set_collapsed(true); @@ -4310,6 +4310,7 @@ PropertyEditor::PropertyEditor() { property_selectable = false; show_type_icons = false; // maybe one day will return. folding_behaviour = FB_UNDEFINED; + is_expandall_enabled = bool(EDITOR_DEF("interface/editor/expand_all_properties", true)); } PropertyEditor::~PropertyEditor() { diff --git a/editor/property_editor.h b/editor/property_editor.h index 299e8d3cd7..a337a05e46 100644 --- a/editor/property_editor.h +++ b/editor/property_editor.h @@ -203,6 +203,7 @@ class PropertyEditor : public Control { bool hide_script; bool use_folding; bool property_selectable; + bool is_expandall_enabled; bool updating_folding; |