diff options
| author | Fabio Alessandrelli <fabio.alessandrelli@gmail.com> | 2021-09-29 13:09:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 13:09:59 +0200 |
| commit | e2e1a5099c80332b8722e61f257cbfcbe8e0e2db (patch) | |
| tree | 7a2dcf1b8a8fcca2b4bf41a3e2d59a2f8e69b864 /platform | |
| parent | 475facb517d3cbe600ca5d62a51e58c47d870497 (diff) | |
| parent | 5d1d9f23de6c7fb873625017a09d37857c9c0967 (diff) | |
Merge pull request #52809 from selgesel/patch1
Release pressed events when the window is blurred on HTML5 platform
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/display_server_javascript.cpp | 7 | ||||
| -rw-r--r-- | platform/javascript/display_server_javascript.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index be4d2cba20..124b4ee1c8 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -595,6 +595,12 @@ void DisplayServerJavaScript::virtual_keyboard_hide() { godot_js_display_vk_hide(); } +// Window blur callback +EM_BOOL DisplayServerJavaScript::blur_callback(int p_event_type, const EmscriptenFocusEvent *p_event, void *p_user_data) { + Input::get_singleton()->release_pressed_events(); + return false; +} + // Gamepad void DisplayServerJavaScript::gamepad_callback(int p_index, int p_connected, const char *p_id, const char *p_guid) { Input *input = Input::get_singleton(); @@ -797,6 +803,7 @@ DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_drive SET_EM_CALLBACK(canvas_id, mousedown, mouse_button_callback) SET_EM_WINDOW_CALLBACK(mousemove, mousemove_callback) SET_EM_WINDOW_CALLBACK(mouseup, mouse_button_callback) + SET_EM_WINDOW_CALLBACK(blur, blur_callback) SET_EM_CALLBACK(canvas_id, wheel, wheel_callback) SET_EM_CALLBACK(canvas_id, touchstart, touch_press_callback) SET_EM_CALLBACK(canvas_id, touchmove, touchmove_callback) diff --git a/platform/javascript/display_server_javascript.h b/platform/javascript/display_server_javascript.h index bf5e229c9a..1863ddefeb 100644 --- a/platform/javascript/display_server_javascript.h +++ b/platform/javascript/display_server_javascript.h @@ -85,6 +85,8 @@ private: static EM_BOOL touch_press_callback(int p_event_type, const EmscriptenTouchEvent *p_event, void *p_user_data); static EM_BOOL touchmove_callback(int p_event_type, const EmscriptenTouchEvent *p_event, void *p_user_data); + static EM_BOOL blur_callback(int p_event_type, const EmscriptenFocusEvent *p_event, void *p_user_data); + static void gamepad_callback(int p_index, int p_connected, const char *p_id, const char *p_guid); void process_joypads(); |