Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

[macOS] Prefer .app bundle icon over the default one.

Browse source
This commit is contained in:
bruvzg 2021-05-13 09:25:09 +03:00
parent b283447bfd
commit 11ccfad1aa
No known key found for this signature in database
GPG key ID: 009E1BFE42239B95
5 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/main.cpp
View file

@ -1696,8 +1696,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
}
#ifdef TOOLS_ENABLED
Ref<Image> icon = memnew(Image(app_icon_png));
DisplayServer::get_singleton()->set_icon(icon);
if (OS::get_singleton()->get_bundle_icon_path().is_empty()) {
Ref<Image> icon = memnew(Image(app_icon_png));
DisplayServer::get_singleton()->set_icon(icon);
}
#endif
}
@ -2391,7 +2393,7 @@ bool Main::start() {
#endif
}
if (!hasicon) {
if (!hasicon && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
Ref<Image> icon = memnew(Image(app_icon_png));
DisplayServer::get_singleton()->set_icon(icon);
}