diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-23 03:01:01 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-23 03:01:01 +0100 |
commit | 5d4056012230d18d3db94db6d7e5c42676dddefc (patch) | |
tree | 1b87de4e8c5e986bf4d740facba96ef40ed241bf | |
parent | c7684e5d0710355a2be7699b6456ff6d9dad5207 (diff) | |
parent | ef0f5f5ed8cdb6dd70f728fd1873158785f43d27 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iee39da40e14cb5a08e1c95feed20a8372ec6d455
-rw-r--r-- | src/plugins/platforms/webgl/webqt.jsx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/webgl/webqt.jsx b/src/plugins/platforms/webgl/webqt.jsx index a3cdede..ca2b3b5 100644 --- a/src/plugins/platforms/webgl/webqt.jsx +++ b/src/plugins/platforms/webgl/webqt.jsx @@ -54,6 +54,8 @@ window.onload = function () { var currentZIndex = 1; var textDecoder; var initialLoadingCanvas; + var supportsTouch = 'ontouchstart' in window || navigator.msMaxTouchPoints; + if (typeof TextDecoder !== 'undefined') { textDecoder = new TextDecoder("utf8"); } else { @@ -227,12 +229,16 @@ window.onload = function () { canvas.onmousedown = function (event) { /* jslint bitwise: true */ + if (supportsTouch && event.mozInputSource == MOZ_SOURCE_TOUCH) + return; qtButtons |= mapButton(event.button); sendMouseEvent(qtButtons, event.layerX, event.layerY, event.clientX, event.clientY, name); }; canvas.onmousemove = function (event) { + if (supportsTouch && event.mozInputSource == MOZ_SOURCE_TOUCH) + return; if (MOUSETRACKING || event.buttons > 0) sendMouseEvent(qtButtons, event.layerX, event.layerY, event.clientX, event.clientY, name); @@ -240,6 +246,8 @@ window.onload = function () { canvas.onmouseup = function (event) { /* jslint bitwise: true */ + if (supportsTouch && event.mozInputSource == MOZ_SOURCE_TOUCH) + return; qtButtons &= ~mapButton(event.button); sendMouseEvent(qtButtons, event.layerX, event.layerY, event.clientX, event.clientY, name); |