summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorn Potter <lorn.potter@gmail.com>2018-10-17 15:06:47 +1000
committerLorn Potter <lorn.potter@gmail.com>2018-10-20 01:41:35 +0000
commit10b8ed816d0dff4321d5a8b0723a8090b2058678 (patch)
tree9d12a3a9f88d87246c626c63bcf0744ed74f0eb1
parent3c4f94b7cb3f319f24fda6502e49bdd199c0f77d (diff)
wasm: fix wheel scroll logic
Task-number: QTBUG-71180 Fixes: QTBUG-71180 Change-Id: If442da096b847fdf69f3b24615e99c2ca988fb79 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
-rw-r--r--src/plugins/platforms/wasm/qwasmeventtranslator.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index cc48c15b64..23251fd610 100644
--- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -50,7 +50,7 @@ using namespace emscripten;
// the existing switching code in QtGui, but for now do it here.
static bool g_usePlatformMacCtrlMetaSwitching = false;
-bool g_useNaturalScrolling = false;
+bool g_useNaturalScrolling = true; // natural scrolling is default on linux/windows
void setNaturalScrolling(bool use) {
g_useNaturalScrolling = use;
@@ -98,7 +98,7 @@ QWasmEventTranslator::QWasmEventTranslator(QObject *parent)
g_usePlatformMacCtrlMetaSwitching = (platform == MacOSPlatform);
if (platform == MacOSPlatform) {
- g_useNaturalScrolling = true; //make this default on macOS
+ g_useNaturalScrolling = false; // make this !default on macOS
EM_ASM(
if (window.safari !== undefined) {//this only works on safari
Module["canvas"].addEventListener('wheel', mouseWheelEvent);
@@ -492,6 +492,9 @@ int QWasmEventTranslator::wheel_cb(int eventType, const EmscriptenWheelEvent *wh
if (wheelEvent->deltaX != 0) pixelDelta.setX(wheelEvent->deltaX * scrollFactor);
QWindowSystemInterface::handleWheelEvent(window2, timestamp, localPoint, globalPoint, QPoint(), pixelDelta, modifiers);
+
+ QWasmEventDispatcher::maintainTimers();
+
return 1;
}