asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 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:40 +03:00
parent fcfce4be67
commit 3b0c071ce2
No known key found for this signature in database
GPG key ID: 009E1BFE42239B95
5 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/os/os.cpp
View file

@ -329,6 +329,11 @@ String OS::get_bundle_resource_dir() const {
return "."; return ".";
}; };
// Path to macOS .app bundle embedded icon
String OS::get_bundle_icon_path() const {
return String();
}
// OS specific path for user:// // OS specific path for user://
String OS::get_user_data_dir() const { String OS::get_user_data_dir() const {
return "."; return ".";

1
core/os/os.h
View file

@ -434,6 +434,7 @@ public:
virtual String get_config_path() const; virtual String get_config_path() const;
virtual String get_cache_path() const; virtual String get_cache_path() const;
virtual String get_bundle_resource_dir() const; virtual String get_bundle_resource_dir() const;
virtual String get_bundle_icon_path() const;
virtual String get_user_data_dir() const; virtual String get_user_data_dir() const;
virtual String get_resource_dir() const; virtual String get_resource_dir() const;

8
main/main.cpp
View file

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

1
platform/osx/os_osx.h
View file

@ -225,6 +225,7 @@ public:
virtual String get_data_path() const; virtual String get_data_path() const;
virtual String get_cache_path() const; virtual String get_cache_path() const;
virtual String get_bundle_resource_dir() const; virtual String get_bundle_resource_dir() const;
virtual String get_bundle_icon_path() const;
virtual String get_godot_dir_name() const; virtual String get_godot_dir_name() const;
virtual String get_system_dir(SystemDir p_dir) const; virtual String get_system_dir(SystemDir p_dir) const;

24
platform/osx/os_osx.mm
View file

@ -2266,14 +2266,26 @@ String OS_OSX::get_cache_path() const {
} }
String OS_OSX::get_bundle_resource_dir() const { String OS_OSX::get_bundle_resource_dir() const {
NSBundle *main = [NSBundle mainBundle];
NSString *resourcePath = [main resourcePath];
char *utfs = strdup([resourcePath UTF8String]);
String ret; String ret;
ret.parse_utf8(utfs);
free(utfs);
NSBundle *main = [NSBundle mainBundle];
if (main) {
NSString *resourcePath = [main resourcePath];
ret.parse_utf8([resourcePath UTF8String]);
}
return ret;
}
String OS_OSX::get_bundle_icon_path() const {
String ret;
NSBundle *main = [NSBundle mainBundle];
if (main) {
NSString *iconPath = [[main infoDictionary] objectForKey:@"CFBundleIconFile"];
if (iconPath) {
ret.parse_utf8([iconPath UTF8String]);
}
}
return ret; return ret;
} }