diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-02 22:53:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 22:53:00 +0100 |
| commit | 3cecf11bb63174fbd9a22084281afa8891c72ca6 (patch) | |
| tree | ed950496e5d20a8efa4180aee6bd5c9a7e6d44fa /platform/javascript/display_server_javascript.cpp | |
| parent | 0e3fb44d4e122702bac8368339e8e66b102c8480 (diff) | |
| parent | 97288f25f49120ac0f010b9b175685973312f528 (diff) | |
Merge pull request #45670 from Faless/js/4.x_canvas_id_fix
[HTML5] Fix mouse_mode and fullscreen detection.
Diffstat (limited to 'platform/javascript/display_server_javascript.cpp')
| -rw-r--r-- | platform/javascript/display_server_javascript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index 915e8eeacf..cfe093693f 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -93,7 +93,7 @@ EM_BOOL DisplayServerJavaScript::fullscreen_change_callback(int p_event_type, co DisplayServerJavaScript *display = get_singleton(); // Empty ID is canvas. String target_id = String::utf8(p_event->id); - if (target_id.is_empty() || target_id == String::utf8(display->canvas_id)) { + if (target_id.is_empty() || target_id == String::utf8(&(display->canvas_id[1]))) { // This event property is the only reliable data on // browser fullscreen state. if (p_event->isFullscreen) { @@ -455,7 +455,7 @@ DisplayServer::MouseMode DisplayServerJavaScript::mouse_get_mode() const { EmscriptenPointerlockChangeEvent ev; emscripten_get_pointerlock_status(&ev); - return (ev.isActive && String::utf8(ev.id) == String::utf8(canvas_id)) ? MOUSE_MODE_CAPTURED : MOUSE_MODE_VISIBLE; + return (ev.isActive && String::utf8(ev.id) == String::utf8(&canvas_id[1])) ? MOUSE_MODE_CAPTURED : MOUSE_MODE_VISIBLE; } // Wheel |