diff options
| author | chris.clst <christophe.claustre.31@gmail.com> | 2021-11-14 03:23:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-14 03:23:22 +0100 |
| commit | 038be68649ca60d4a2ffb3c05bdd3cc8ec4841f4 (patch) | |
| tree | 29dfaacbcab32b7915743a5959f57b05d7816c31 /core/core_bind.cpp | |
| parent | cc39ba5509263346f33894be3a2c84580c1168a9 (diff) | |
| parent | ed300d7be536b1ec325ba77521eceee73dd0e5fb (diff) | |
| download | redot-engine-038be68649ca60d4a2ffb3c05bdd3cc8ec4841f4.tar.gz | |
Merge branch 'godotengine:master' into bugfix_shader_compile_spirv_from_source
Diffstat (limited to 'core/core_bind.cpp')
| -rw-r--r-- | core/core_bind.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/core_bind.cpp b/core/core_bind.cpp index b1858c6b32..d42d39a159 100644 --- a/core/core_bind.cpp +++ b/core/core_bind.cpp @@ -502,15 +502,15 @@ String OS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const { return ::OS::get_singleton()->get_system_dir(::OS::SystemDir(p_dir), p_shared_storage); } -String OS::get_keycode_string(uint32_t p_code) const { +String OS::get_keycode_string(Key p_code) const { return ::keycode_get_string(p_code); } -bool OS::is_keycode_unicode(uint32_t p_unicode) const { - return ::keycode_has_unicode(p_unicode); +bool OS::is_keycode_unicode(char32_t p_unicode) const { + return ::keycode_has_unicode((Key)p_unicode); } -int OS::find_keycode_from_string(const String &p_code) const { +Key OS::find_keycode_from_string(const String &p_code) const { return find_keycode(p_code); } |