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

[HTML5] Fix focus (again) in Firefox's iframes.

Browse Source 
This actually makes sense(?), when running inside an iframe the active
element might be our canvas, while the iframe itself is not active in
the parent window. Since we consume the event, the iframe does not get
focused in Firefox (but does in Chromium-based browsers), so we must
always call focus to handle such occasions.
This commit is contained in:
Fabio Alessandrelli 2021-11-26 09:39:57 +01:00
parent 4813abc6e7
commit 63e2db2499
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,7 +393,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) { // Since the event is consumed, focus manually.
// NOTE: The iframe container may not have focus yet, so focus even when already active.
if (p_pressed) {
GodotConfig.canvas.focus(); 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)) {
@ -412,7 +414,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) { // Since the event is consumed, focus manually.
// NOTE: The iframe container may not have focus yet, so focus even when already active.
if (type === 0) {
GodotConfig.canvas.focus(); GodotConfig.canvas.focus();
} }
const rect = canvas.getBoundingClientRect(); const rect = canvas.getBoundingClientRect();