From c6ef223498e112bbce73e6cdf3db7de29a93e416 Mon Sep 17 00:00:00 2001 From: Warlaan Date: Sat, 4 Jun 2016 10:06:42 +0200 Subject: The create dialog starts collapsed now. The original behavior can be reactivated in the editor settings. (cherry picked from commit 987192775a713c61bc7ac17b54b3bbd1d1e067f3) --- tools/editor/create_dialog.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tools/editor/create_dialog.cpp') diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp index 060998c19..47411f0cd 100644 --- a/tools/editor/create_dialog.cpp +++ b/tools/editor/create_dialog.cpp @@ -36,6 +36,7 @@ #if 1 #include "os/keyboard.h" +#include "editor_settings.h" #include "editor_help.h" @@ -108,6 +109,18 @@ void CreateDialog::add_type(const String& p_type,HashMap& p_ty } + if (bool(EditorSettings::get_singleton()->get("scenetree_editor/start_create_dialog_fully_expanded"))) { + item->set_collapsed(false); + } else { + // don't collapse search results + bool collapse = (search_box->get_text() == ""); + // don't collapse the root node + collapse &= (item != p_root); + // don't collapse abstract nodes on the first tree level + collapse &= ((parent != p_root) || (ObjectTypeDB::can_instance(p_type))); + item->set_collapsed(collapse); + } + const String& description = EditorHelp::get_doc_data()->class_list[p_type].brief_description; item->set_tooltip(0,description); -- cgit v1.3.1