godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HTML5] Fix input not focusing canvas. 

mousedown and touchstart should focus the canvas to ensure correct
application lifecycle.

(cherry picked from commit f13c7fc83e)
This commit is contained in:
Fabio Alessandrelli 2021-11-19 03:46:04 +01:00 committed by Rémi Verschelde
parent 1698dbe30e
commit d70461b27e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/javascript/js/libs/library_godot_input.js
View File

@ -389,6 +389,9 @@ const GodotInput = {
const rect = canvas.getBoundingClientRect(); const rect = canvas.getBoundingClientRect();
const pos = GodotInput.computePosition(evt, rect); const pos = GodotInput.computePosition(evt, rect);
const modifiers = GodotInput.getModifiers(evt); const modifiers = GodotInput.getModifiers(evt);
if (p_pressed && document.activeElement !== GodotConfig.canvas) {
GodotConfig.canvas.focus();
}
if (func(p_pressed, evt.button, pos[0], pos[1], modifiers)) { if (func(p_pressed, evt.button, pos[0], pos[1], modifiers)) {
evt.preventDefault(); evt.preventDefault();
} }
@ -405,6 +408,9 @@ const GodotInput = {
const func = GodotRuntime.get_func(callback); const func = GodotRuntime.get_func(callback);
const canvas = GodotConfig.canvas; const canvas = GodotConfig.canvas;
function touch_cb(type, evt) { function touch_cb(type, evt) {
if (type === 0 && document.activeElement !== GodotConfig.canvas) {
GodotConfig.canvas.focus();
}
const rect = canvas.getBoundingClientRect(); const rect = canvas.getBoundingClientRect();
const touches = evt.changedTouches; const touches = evt.changedTouches;
for (let i = 0; i < touches.length; i++) { for (let i = 0; i < touches.length; i++) {