asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #45671 from Faless/js/3.x_canvas_id_fix

Browse source 
[3.2] [HTML5] Fix mouse_mode and fullscreen detection.
This commit is contained in:
Rémi Verschelde 2021-02-02 22:53:37 +01:00 committed by GitHub
commit b1c7078551
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/javascript/os_javascript.cpp
View file

@ -129,7 +129,7 @@ EM_BOOL OS_JavaScript::fullscreen_change_callback(int p_event_type, const Emscri
OS_JavaScript *os = get_singleton(); OS_JavaScript *os = get_singleton();
// Empty ID is canvas. // Empty ID is canvas.
String target_id = String::utf8(p_event->id); String target_id = String::utf8(p_event->id);
if (target_id.empty() || target_id == String::utf8(os->canvas_id)) { if (target_id.empty() || target_id == String::utf8(&(os->canvas_id[1]))) {
// This event property is the only reliable data on // This event property is the only reliable data on
// browser fullscreen state. // browser fullscreen state.
os->video_mode.fullscreen = p_event->isFullscreen; os->video_mode.fullscreen = p_event->isFullscreen;
@ -589,7 +589,7 @@ OS::MouseMode OS_JavaScript::get_mouse_mode() const {
EmscriptenPointerlockChangeEvent ev; EmscriptenPointerlockChangeEvent ev;
emscripten_get_pointerlock_status(&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 // Wheel