godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 21 additions and 21 deletions
Show Stats 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() { bool Main::start() {
ERR_FAIL_COND_V(!_start_success, false); ERR_FAIL_COND_V(!_start_success, false);
bool hasicon = false; bool has_icon = false;
String positional_arg; String positional_arg;
String game_path; String game_path;
String script; String script;
@ -3192,28 +3192,28 @@ bool Main::start() {
sml->add_current_scene(scene); sml->add_current_scene(scene);
#ifdef MACOS_ENABLED #ifdef MACOS_ENABLED
String mac_iconpath = GLOBAL_GET("application/config/macos_native_icon"); String mac_icon_path = GLOBAL_GET("application/config/macos_native_icon");
if (!mac_iconpath.is_empty()) { if (!mac_icon_path.is_empty()) {
DisplayServer::get_singleton()->set_native_icon(mac_iconpath); DisplayServer::get_singleton()->set_native_icon(mac_icon_path);
hasicon = true; has_icon = true;
} }
#endif #endif
#ifdef WINDOWS_ENABLED #ifdef WINDOWS_ENABLED
String win_iconpath = GLOBAL_GET("application/config/windows_native_icon"); String win_icon_path = GLOBAL_GET("application/config/windows_native_icon");
if (!win_iconpath.is_empty()) { if (!win_icon_path.is_empty()) {
DisplayServer::get_singleton()->set_native_icon(win_iconpath); DisplayServer::get_singleton()->set_native_icon(win_icon_path);
hasicon = true; has_icon = true;
} }
#endif #endif
String iconpath = GLOBAL_GET("application/config/icon"); String icon_path = GLOBAL_GET("application/config/icon");
if ((!iconpath.is_empty()) && (!hasicon)) { if ((!icon_path.is_empty()) && (!has_icon)) {
Ref<Image> icon; Ref<Image> icon;
icon.instantiate(); icon.instantiate();
if (ImageLoader::load_image(iconpath, icon) == OK) { if (ImageLoader::load_image(icon_path, icon) == OK) {
DisplayServer::get_singleton()->set_icon(icon); DisplayServer::get_singleton()->set_icon(icon);
hasicon = true; has_icon = true;
} }
} }
} }
@ -3241,7 +3241,7 @@ bool Main::start() {
#endif #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)); Ref<Image> icon = memnew(Image(app_icon_png));
DisplayServer::get_singleton()->set_icon(icon); DisplayServer::get_singleton()->set_icon(icon);
} }

14
platform/macos/export/export_plugin.cpp
View File

@ -1674,16 +1674,16 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
if (file == "Contents/Resources/icon.icns") { if (file == "Contents/Resources/icon.icns") {
// See if there is an icon. // See if there is an icon.
String iconpath; String icon_path;
if (p_preset->get("application/icon") != "") { if (p_preset->get("application/icon") != "") {
iconpath = p_preset->get("application/icon"); icon_path = p_preset->get("application/icon");
} else { } else {
iconpath = GLOBAL_GET("application/config/icon"); icon_path = GLOBAL_GET("application/config/icon");
} }
if (!iconpath.is_empty()) { if (!icon_path.is_empty()) {
if (iconpath.get_extension() == "icns") { if (icon_path.get_extension() == "icns") {
Ref<FileAccess> icon = FileAccess::open(iconpath, FileAccess::READ); Ref<FileAccess> icon = FileAccess::open(icon_path, FileAccess::READ);
if (icon.is_valid()) { if (icon.is_valid()) {
data.resize(icon->get_length()); data.resize(icon->get_length());
icon->get_buffer(&data.write[0], icon->get_length()); icon->get_buffer(&data.write[0], icon->get_length());
@ -1691,7 +1691,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
} else { } else {
Ref<Image> icon; Ref<Image> icon;
icon.instantiate(); icon.instantiate();
err = ImageLoader::load_image(iconpath, icon); err = ImageLoader::load_image(icon_path, icon);
if (err == OK && !icon->is_empty()) { if (err == OK && !icon->is_empty()) {
_make_icon(p_preset, icon, data); _make_icon(p_preset, icon, data);
} }