maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10998 from MillionOstrich/custom-types-fix-icons

Browse source 
Fix icons for custom types in the recent & favorites lists in the create dialog
This commit is contained in:
Rémi Verschelde 2017-09-17 12:42:08 +02:00 committed by GitHub
parent c24ca2c7a8 672a6c9680
commit 3e66cd9b68
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
editor/create_dialog.cpp
View file

@ -54,12 +54,7 @@ void CreateDialog::popup_create(bool p_dontclear) {
TreeItem *ti = recent->create_item(root);
ti->set_text(0, l);
if (has_icon(l, "EditorIcons")) {
ti->set_icon(0, get_icon(l, "EditorIcons"));
} else {
ti->set_icon(0, get_icon("Object", "EditorIcons"));
}
ti->set_icon(0, _get_editor_icon(l));
}
}
@ -122,6 +117,29 @@ void CreateDialog::_sbox_input(const Ref<InputEvent> &p_ie) {
}
}
Ref<Texture> CreateDialog::_get_editor_icon(const String &p_type) const {
if (has_icon(p_type, "EditorIcons")) {
return get_icon(p_type, "EditorIcons");
}
const Map<String, Vector<EditorData::CustomType> > &p_map = EditorNode::get_editor_data().get_custom_types();
for (const Map<String, Vector<EditorData::CustomType> >::Element *E = p_map.front(); E; E = E->next()) {
const Vector<EditorData::CustomType> &ct = E->value();
for (int i = 0; i < ct.size(); ++i) {
if (ct[i].name == p_type) {
if (ct[i].icon.is_valid()) {
return ct[i].icon;
} else {
return get_icon("Object", "EditorIcons");
}
}
}
}
return get_icon("Object", "EditorIcons");
}
void CreateDialog::add_type(const String &p_type, HashMap<String, TreeItem *> &p_types, TreeItem *p_root, TreeItem **to_select) {
if (p_types.has(p_type))
@ -457,13 +475,7 @@ void CreateDialog::_update_favorite_list() {
TreeItem *ti = favorites->create_item(root);
String l = favorite_list[i];
ti->set_text(0, l);
if (has_icon(l, "EditorIcons")) {
ti->set_icon(0, get_icon(l, "EditorIcons"));
} else {
ti->set_icon(0, get_icon("Object", "EditorIcons"));
}
ti->set_icon(0, _get_editor_icon(l));
}
}

2
editor/create_dialog.h
View file

@ -74,6 +74,8 @@ class CreateDialog : public ConfirmationDialog {
void _confirmed();
void _text_changed(const String &p_newtext);
Ref<Texture> _get_editor_icon(const String &p_type) const;
void add_type(const String &p_type, HashMap<String, TreeItem *> &p_types, TreeItem *p_root, TreeItem **to_select);
Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);