1 files changed, 32 insertions, 1 deletions

diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp
index 210b799f3d..5aac8bff09 100644
--- a/tools/editor/create_dialog.cpp
+++ b/tools/editor/create_dialog.cpp
@@ -140,7 +140,7 @@ void CreateDialog::_update_search() {
 
 
 	search_options->clear();
-
+	help_bit->set_text("");
 	/*
 	TreeItem *root = search_options->create_item();
 	_parse_fs(EditorFileSystem::get_singleton()->get_filesystem());
@@ -154,6 +154,9 @@ void CreateDialog::_update_search() {
 	TreeItem *root = search_options->create_item();
 
 	root->set_text(0,base_type);
+	if (has_icon(base_type,"EditorIcons")) {
+		root->set_icon(0,get_icon(base_type,"EditorIcons"));
+	}
 
 	List<StringName>::Element *I=type_list.front();
 	TreeItem *to_select=NULL;
@@ -161,8 +164,11 @@ void CreateDialog::_update_search() {
 	for(;I;I=I->next()) {
 
 
+
 		String type=I->get();
 
+		if (base_type=="Node" && type.begins_with("Editor"))
+			continue; // do not show editor nodes
 
 		if (!ObjectTypeDB::can_instance(type))
 			continue; // cant create what can't be instanced
@@ -286,9 +292,12 @@ String CreateDialog::get_selected_type() {
 Object *CreateDialog::instance_selected() {
 
 	TreeItem *selected = search_options->get_selected();
+
 	if (selected) {
 
 		String custom = selected->get_metadata(0);
+
+
 		if (custom!=String()) {
 			if (EditorNode::get_editor_data().get_custom_types().has(custom)) {
 
@@ -317,6 +326,7 @@ Object *CreateDialog::instance_selected() {
 		}
 	}
 
+
 	return NULL;
 }
 
@@ -326,11 +336,27 @@ String CreateDialog::get_base_type() const {
 	return base_type;
 }
 
+void CreateDialog::_item_selected() {
+
+	TreeItem *item = search_options->get_selected();
+	if (!item)
+		return;
+
+	String name = item->get_text(0);
+
+	if (!EditorHelp::get_doc_data()->class_list.has(name))
+		return;
+
+	help_bit->set_text(EditorHelp::get_doc_data()->class_list[name].brief_description);
+
+}
+
 void CreateDialog::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_text_changed"),&CreateDialog::_text_changed);
 	ObjectTypeDB::bind_method(_MD("_confirmed"),&CreateDialog::_confirmed);
 	ObjectTypeDB::bind_method(_MD("_sbox_input"),&CreateDialog::_sbox_input);
+	ObjectTypeDB::bind_method(_MD("_item_selected"),&CreateDialog::_item_selected);
 
 	ADD_SIGNAL(MethodInfo("create"));
 
@@ -354,9 +380,14 @@ CreateDialog::CreateDialog() {
 	register_text_enter(search_box);
 	set_hide_on_ok(false);
 	search_options->connect("item_activated",this,"_confirmed");
+	search_options->connect("cell_selected",this,"_item_selected");
 //	search_options->set_hide_root(true);
 	base_type="Object";
 
+	help_bit = memnew( EditorHelpBit );
+	vbc->add_margin_child(TTR("Description:"),help_bit);
+	help_bit->connect("request_hide",this,"_closed");
+
 }