mirror of
https://github.com/godotengine/godot
synced 2024-09-15 21:39:58 +00:00
Merge pull request #86979 from alessandrofama/editor-resource-picker-icons
Fix missing icons for custom resources in EditorResourcePicker
This commit is contained in:
commit
a2d61a9ac4
|
@ -487,38 +487,16 @@ void EditorResourcePicker::set_create_options(Object *p_menu_node) {
|
||||||
HashSet<StringName> allowed_types;
|
HashSet<StringName> allowed_types;
|
||||||
_get_allowed_types(false, &allowed_types);
|
_get_allowed_types(false, &allowed_types);
|
||||||
|
|
||||||
Vector<EditorData::CustomType> custom_resources;
|
|
||||||
if (EditorNode::get_editor_data().get_custom_types().has("Resource")) {
|
|
||||||
custom_resources = EditorNode::get_editor_data().get_custom_types()["Resource"];
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const StringName &E : allowed_types) {
|
for (const StringName &E : allowed_types) {
|
||||||
const String &t = E;
|
const String &t = E;
|
||||||
|
|
||||||
bool is_custom_resource = false;
|
if (!ClassDB::can_instantiate(t)) {
|
||||||
Ref<Texture2D> icon;
|
|
||||||
if (!custom_resources.is_empty()) {
|
|
||||||
for (int j = 0; j < custom_resources.size(); j++) {
|
|
||||||
if (custom_resources[j].name == t) {
|
|
||||||
is_custom_resource = true;
|
|
||||||
if (custom_resources[j].icon.is_valid()) {
|
|
||||||
icon = custom_resources[j].icon;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_custom_resource && !ClassDB::can_instantiate(t)) {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
inheritors_array.push_back(t);
|
inheritors_array.push_back(t);
|
||||||
|
|
||||||
if (!icon.is_valid()) {
|
Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(t, "Object");
|
||||||
icon = get_editor_theme_icon(has_theme_icon(t, EditorStringName(EditorIcons)) ? t : String("Object"));
|
|
||||||
}
|
|
||||||
|
|
||||||
int id = TYPE_BASE_ID + idx;
|
int id = TYPE_BASE_ID + idx;
|
||||||
edit_menu->add_icon_item(icon, vformat(TTR("New %s"), t), id);
|
edit_menu->add_icon_item(icon, vformat(TTR("New %s"), t), id);
|
||||||
|
|
||||||
|
@ -804,7 +782,12 @@ void EditorResourcePicker::_notification(int p_what) {
|
||||||
[[fallthrough]];
|
[[fallthrough]];
|
||||||
}
|
}
|
||||||
case NOTIFICATION_THEME_CHANGED: {
|
case NOTIFICATION_THEME_CHANGED: {
|
||||||
assign_button->add_theme_constant_override("icon_max_width", get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
|
const int icon_width = get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
|
||||||
|
assign_button->add_theme_constant_override("icon_max_width", icon_width);
|
||||||
|
if (edit_menu) {
|
||||||
|
edit_menu->add_theme_constant_override("icon_max_width", icon_width);
|
||||||
|
}
|
||||||
|
|
||||||
edit_button->set_icon(get_theme_icon(SNAME("select_arrow"), SNAME("Tree")));
|
edit_button->set_icon(get_theme_icon(SNAME("select_arrow"), SNAME("Tree")));
|
||||||
} break;
|
} break;
|
||||||
|
|
||||||
|
@ -940,6 +923,7 @@ void EditorResourcePicker::_ensure_resource_menu() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
edit_menu = memnew(PopupMenu);
|
edit_menu = memnew(PopupMenu);
|
||||||
|
edit_menu->add_theme_constant_override("icon_max_width", get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
|
||||||
add_child(edit_menu);
|
add_child(edit_menu);
|
||||||
edit_menu->connect("id_pressed", callable_mp(this, &EditorResourcePicker::_edit_menu_cbk));
|
edit_menu->connect("id_pressed", callable_mp(this, &EditorResourcePicker::_edit_menu_cbk));
|
||||||
edit_menu->connect("popup_hide", callable_mp((BaseButton *)edit_button, &BaseButton::set_pressed).bind(false));
|
edit_menu->connect("popup_hide", callable_mp((BaseButton *)edit_button, &BaseButton::set_pressed).bind(false));
|
||||||
|
|
Loading…
Reference in a new issue