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 /core/os | |
parent | d4e26fd588e2d136b19b4616a743d67f600c6192 (diff) | |
parent | 2b9ed68d6a261bdabf4a6a3e205e42471c38d443 (diff) |
Merge pull request #29119 from bruvzg/native_icon_support
Add native window/taskbar icon support for Windows and macOS.
Diffstat (limited to 'core/os')
-rw-r--r-- | core/os/os.cpp | 3 | ||||
-rw-r--r-- | core/os/os.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index ea378c9e83..1a3c9ac5f8 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -465,6 +465,9 @@ void OS::_ensure_user_data_dir() { memdelete(da); } +void OS::set_native_icon(const String &p_filename) { +} + void OS::set_icon(const Ref<Image> &p_icon) { } diff --git a/core/os/os.h b/core/os/os.h index 07865b636e..4f6a539e78 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -451,6 +451,7 @@ public: virtual void make_rendering_thread(); virtual void swap_buffers(); + virtual void set_native_icon(const String &p_filename); virtual void set_icon(const Ref<Image> &p_icon); virtual int get_exit_code() const; |