godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #75666 from ronyeh/main.cpp-2

Browse Source 
Rename `iconpath` => `icon_path` & `hasicon` => `has_icon`.
This commit is contained in:
Rémi Verschelde
2023-06-02 17:26:18 +02:00
parent 5c2bb20f3d c8cbc67156
commit 8623572b1f
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
main/main.cpp
View File

@@ -2562,7 +2562,7 @@ static MainTimerSync main_timer_sync;
bool Main::start() {
ERR_FAIL_COND_V(!_start_success, false);
bool hasicon = false;
bool has_icon = false;
String positional_arg;
String game_path;
String script;
@@ -3192,28 +3192,28 @@ bool Main::start() {
sml->add_current_scene(scene);
#ifdef MACOS_ENABLED
String mac_iconpath = GLOBAL_GET("application/config/macos_native_icon");
if (!mac_iconpath.is_empty()) {
DisplayServer::get_singleton()->set_native_icon(mac_iconpath);
hasicon = true;
String mac_icon_path = GLOBAL_GET("application/config/macos_native_icon");
if (!mac_icon_path.is_empty()) {
DisplayServer::get_singleton()->set_native_icon(mac_icon_path);
has_icon = true;
}
#endif
#ifdef WINDOWS_ENABLED
String win_iconpath = GLOBAL_GET("application/config/windows_native_icon");
if (!win_iconpath.is_empty()) {
DisplayServer::get_singleton()->set_native_icon(win_iconpath);
hasicon = true;
String win_icon_path = GLOBAL_GET("application/config/windows_native_icon");
if (!win_icon_path.is_empty()) {
DisplayServer::get_singleton()->set_native_icon(win_icon_path);
has_icon = true;
}
#endif
String iconpath = GLOBAL_GET("application/config/icon");
if ((!iconpath.is_empty()) && (!hasicon)) {
String icon_path = GLOBAL_GET("application/config/icon");
if ((!icon_path.is_empty()) && (!has_icon)) {
Ref<Image> icon;
icon.instantiate();
if (ImageLoader::load_image(iconpath, icon) == OK) {
if (ImageLoader::load_image(icon_path, icon) == OK) {
DisplayServer::get_singleton()->set_icon(icon);
hasicon = true;
has_icon = true;
}
}
}
@@ -3241,7 +3241,7 @@ bool Main::start() {
#endif
}
if (!hasicon && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
if (!has_icon && OS::get_singleton()->get_bundle_icon_path().is_empty()) {
Ref<Image> icon = memnew(Image(app_icon_png));
DisplayServer::get_singleton()->set_icon(icon);
}