godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39099 from YeldhamDev/create_dialog_icon_fallback 

Add fallback icons and make custom ones appear in the recent/favorites list in the "Create New" dialog
This commit is contained in:
Rémi Verschelde 2020-06-04 11:58:55 +02:00 committed by GitHub
parent 6a7b55805b 84d7492b2d
commit f05b4fea33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editor/create_dialog.cpp
View File

@ -53,13 +53,15 @@ void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const St
if (f) { if (f) {
TreeItem *root = recent->create_item(); TreeItem *root = recent->create_item();
String icon_fallback = search_options->has_theme_icon(base_type, "EditorIcons") ? base_type : "Object";
while (!f->eof_reached()) { while (!f->eof_reached()) {
String l = f->get_line().strip_edges(); String l = f->get_line().strip_edges();
String name = l.split(" ")[0]; String name = l.split(" ")[0];
if ((ClassDB::class_exists(name) || ScriptServer::is_global_class(name)) && !_is_class_disabled_by_feature_profile(name)) { if ((ClassDB::class_exists(name) || ScriptServer::is_global_class(name)) && !_is_class_disabled_by_feature_profile(name)) {
TreeItem *ti = recent->create_item(root); TreeItem *ti = recent->create_item(root);
ti->set_text(0, l); ti->set_text(0, l);
ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(l, base_type)); ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(name, icon_fallback));
} }
} }
@ -248,7 +250,8 @@ void CreateDialog::add_type(const String &p_type, HashMap<String, TreeItem *> &p
const String &description = DTR(EditorHelp::get_doc_data()->class_list[p_type].brief_description); const String &description = DTR(EditorHelp::get_doc_data()->class_list[p_type].brief_description);
item->set_tooltip(0, description); item->set_tooltip(0, description);
item->set_icon(0, EditorNode::get_singleton()->get_class_icon(p_type, base_type)); String icon_fallback = search_options->has_theme_icon(base_type, "EditorIcons") ? base_type : "Object";
item->set_icon(0, EditorNode::get_singleton()->get_class_icon(p_type, icon_fallback));
p_types[p_type] = item; p_types[p_type] = item;
} }
@ -305,9 +308,8 @@ void CreateDialog::_update_search() {
EditorData &ed = EditorNode::get_editor_data(); EditorData &ed = EditorNode::get_editor_data();
root->set_text(0, base_type); root->set_text(0, base_type);
if (search_options->has_theme_icon(base_type, "EditorIcons")) { String base_icon = search_options->has_theme_icon(base_type, "EditorIcons") ? base_type : "Object";
root->set_icon(0, search_options->get_theme_icon(base_type, "EditorIcons")); root->set_icon(0, search_options->get_theme_icon(base_icon, "EditorIcons"));
}
TreeItem *to_select = search_box->get_text() == base_type ? root : nullptr; TreeItem *to_select = search_box->get_text() == base_type ? root : nullptr;
@ -393,9 +395,7 @@ void CreateDialog::_update_search() {
TreeItem *item = search_options->create_item(ti); TreeItem *item = search_options->create_item(ti);
item->set_metadata(0, type); item->set_metadata(0, type);
item->set_text(0, ct[i].name); item->set_text(0, ct[i].name);
if (ct[i].icon.is_valid()) { item->set_icon(0, ct[i].icon.is_valid() ? ct[i].icon : search_options->get_theme_icon(base_icon, "EditorIcons"));
item->set_icon(0, ct[i].icon);
}
if (!to_select || ct[i].name == search_box->get_text()) { if (!to_select || ct[i].name == search_box->get_text()) {
to_select = item; to_select = item;
@ -598,16 +598,21 @@ void CreateDialog::_save_favorite_list() {
void CreateDialog::_update_favorite_list() { void CreateDialog::_update_favorite_list() {
favorites->clear(); favorites->clear();
TreeItem *root = favorites->create_item(); TreeItem *root = favorites->create_item();
String icon_fallback = search_options->has_theme_icon(base_type, "EditorIcons") ? base_type : "Object";
for (int i = 0; i < favorite_list.size(); i++) { for (int i = 0; i < favorite_list.size(); i++) {
String l = favorite_list[i]; String l = favorite_list[i];
String name = l.split(" ")[0]; String name = l.split(" ")[0];
if (!((ClassDB::class_exists(name) || ScriptServer::is_global_class(name)) && !_is_class_disabled_by_feature_profile(name))) { if (!((ClassDB::class_exists(name) || ScriptServer::is_global_class(name)) && !_is_class_disabled_by_feature_profile(name))) {
continue; continue;
} }
TreeItem *ti = favorites->create_item(root); TreeItem *ti = favorites->create_item(root);
ti->set_text(0, l); ti->set_text(0, l);
ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(l, base_type)); ti->set_icon(0, EditorNode::get_singleton()->get_class_icon(name, icon_fallback));
} }
emit_signal("favorites_updated"); emit_signal("favorites_updated");
} }