diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-11 11:20:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 11:20:45 +0200 |
| commit | c00303ff55f2a67d5cb1a031070e3b1fe7b15a9e (patch) | |
| tree | 41c169c558961c715283d70822a703bd0a7c0706 /platform/iphone | |
| parent | a902f760634432adcb5f74b3b6cd27a7275a320f (diff) | |
| parent | fa3a32a2d6b054543645b0d4752514c90732b935 (diff) | |
Merge pull request #47378 from aaronfranke/use-input-enums
Use key enum instead of plain integers for input code
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/display_server_iphone.h | 2 | ||||
| -rw-r--r-- | platform/iphone/display_server_iphone.mm | 2 | ||||
| -rw-r--r-- | platform/iphone/keyboard_input_view.mm | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/iphone/display_server_iphone.h b/platform/iphone/display_server_iphone.h index 8ba7a69a4f..cd2de550f1 100644 --- a/platform/iphone/display_server_iphone.h +++ b/platform/iphone/display_server_iphone.h @@ -105,7 +105,7 @@ public: // MARK: Keyboard - void key(uint32_t p_key, bool p_pressed); + void key(Key p_key, bool p_pressed); // MARK: Motion diff --git a/platform/iphone/display_server_iphone.mm b/platform/iphone/display_server_iphone.mm index b4f0a32027..e18448fb6d 100644 --- a/platform/iphone/display_server_iphone.mm +++ b/platform/iphone/display_server_iphone.mm @@ -254,7 +254,7 @@ void DisplayServerIPhone::touches_cancelled(int p_idx) { // MARK: Keyboard -void DisplayServerIPhone::key(uint32_t p_key, bool p_pressed) { +void DisplayServerIPhone::key(Key p_key, bool p_pressed) { Ref<InputEventKey> ev; ev.instantiate(); ev->set_echo(false); diff --git a/platform/iphone/keyboard_input_view.mm b/platform/iphone/keyboard_input_view.mm index 0e5a98a3e6..e2bd0acff4 100644 --- a/platform/iphone/keyboard_input_view.mm +++ b/platform/iphone/keyboard_input_view.mm @@ -138,8 +138,8 @@ break; } - DisplayServerIPhone::get_singleton()->key(character, true); - DisplayServerIPhone::get_singleton()->key(character, false); + DisplayServerIPhone::get_singleton()->key((Key)character, true); + DisplayServerIPhone::get_singleton()->key((Key)character, false); } } |