diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-27 12:09:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 12:09:42 +0200 |
| commit | e8fbb28e207de4b3e6a50b4f683bbff0673360ab (patch) | |
| tree | 3592784a29fee57e4e9f774ae68278f4288debf5 /main/main.cpp | |
| parent | d4e26fd588e2d136b19b4616a743d67f600c6192 (diff) | |
| parent | 2b9ed68d6a261bdabf4a6a3e205e42471c38d443 (diff) | |
| download | redot-engine-e8fbb28e207de4b3e6a50b4f683bbff0673360ab.tar.gz | |
Merge pull request #29119 from bruvzg/native_icon_support
Add native window/taskbar icon support for Windows and macOS.
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index fb75b4d78f..fdb5bca624 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1197,6 +1197,12 @@ Error Main::setup2(Thread::ID p_main_tid_override) { GLOBAL_DEF("application/config/icon", String()); ProjectSettings::get_singleton()->set_custom_property_info("application/config/icon", PropertyInfo(Variant::STRING, "application/config/icon", PROPERTY_HINT_FILE, "*.png,*.webp")); + GLOBAL_DEF("application/config/macos_native_icon", String()); + ProjectSettings::get_singleton()->set_custom_property_info("application/config/macos_native_icon", PropertyInfo(Variant::STRING, "application/config/macos_native_icon", PROPERTY_HINT_FILE, "*.icns")); + + GLOBAL_DEF("application/config/windows_native_icon", String()); + ProjectSettings::get_singleton()->set_custom_property_info("application/config/windows_native_icon", PropertyInfo(Variant::STRING, "application/config/windows_native_icon", PROPERTY_HINT_FILE, "*.ico")); + InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton()); if (id) { if (bool(GLOBAL_DEF("input_devices/pointing/emulate_touch_from_mouse", false)) && !(editor || project_manager)) { @@ -1747,8 +1753,24 @@ bool Main::start() { ERR_FAIL_COND_V(!scene, false) sml->add_current_scene(scene); +#ifdef OSX_ENABLED + String mac_iconpath = GLOBAL_DEF("application/config/macos_native_icon", "Variant()"); + if (mac_iconpath != "") { + OS::get_singleton()->set_native_icon(mac_iconpath); + hasicon = true; + } +#endif + +#ifdef WINDOWS_ENABLED + String win_iconpath = GLOBAL_DEF("application/config/windows_native_icon", "Variant()"); + if (win_iconpath != "") { + OS::get_singleton()->set_native_icon(win_iconpath); + hasicon = true; + } +#endif + String iconpath = GLOBAL_DEF("application/config/icon", "Variant()"); - if (iconpath != "") { + if ((iconpath != "") && (!hasicon)) { Ref<Image> icon; icon.instance(); if (ImageLoader::load_image(iconpath, icon) == OK) { |