Merge pull request #109936 from clayjohn/revert-web-mouse

Revert "[Web] Disregard touch events in pointer callbacks"
This commit is contained in:
Thaddeus Crews 2025-08-24 14:23:04 -05:00
commit 03d114e765
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC

View file

@ -504,10 +504,6 @@ const GodotInput = {
const func = GodotRuntime.get_func(callback);
const canvas = GodotConfig.canvas;
function move_cb(evt) {
if (evt.pointerType == 'touch') {
return;
}
const rect = canvas.getBoundingClientRect();
const pos = GodotInput.computePosition(evt, rect);
// Scale movement
@ -539,10 +535,6 @@ const GodotInput = {
const func = GodotRuntime.get_func(callback);
const canvas = GodotConfig.canvas;
function button_cb(p_pressed, evt) {
if (evt.pointerType == 'touch') {
return;
}
const rect = canvas.getBoundingClientRect();
const pos = GodotInput.computePosition(evt, rect);
const modifiers = GodotInput.getModifiers(evt);
@ -555,8 +547,8 @@ const GodotInput = {
evt.preventDefault();
}
}
GodotEventListeners.add(canvas, 'pointerdown', button_cb.bind(null, 1), false);
GodotEventListeners.add(window, 'pointerup', button_cb.bind(null, 0), false);
GodotEventListeners.add(canvas, 'mousedown', button_cb.bind(null, 1), false);
GodotEventListeners.add(window, 'mouseup', button_cb.bind(null, 0), false);
},
/*