diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-09-12 20:37:42 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2021-12-23 11:21:57 +0100 |
commit | 23964ce05f37fda4594c7eb33162e9bc1be962fc (patch) | |
tree | 987dc297304b3f2788219ad9124c8ff88783d04c /src/plugins/platforms/wasm/qwasmeventtranslator.cpp | |
parent | e98f5de6e1a19e06cc9e94ea01ca27d9a65f8d70 (diff) |
wasm: Use new event dispatcher for QtGui
The event dispatcher implementation is now in QtCore,
except for the call to QWindowSystemInterface::sendWindowSystemEvents().
Implement QWasmWindow::requestUpdate() using emscripten_request_animation_frame(),
instead of the previous registerRequestUpdateCallback() function
which now is removed.
Pick-to: 6.3
Change-Id: I7a13eb5391d48dba0f2afe4704ef3188b8daa74b
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmeventtranslator.cpp')
-rw-r--r-- | src/plugins/platforms/wasm/qwasmeventtranslator.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp index 6d4ead60d5..598b77f541 100644 --- a/src/plugins/platforms/wasm/qwasmeventtranslator.cpp +++ b/src/plugins/platforms/wasm/qwasmeventtranslator.cpp @@ -371,7 +371,6 @@ int QWasmEventTranslator::mouse_cb(int eventType, const EmscriptenMouseEvent *mo { QWasmEventTranslator *translator = (QWasmEventTranslator*)userData; bool accepted = translator->processMouse(eventType,mouseEvent); - QWasmEventDispatcher::maintainTimers(); return accepted; } @@ -592,7 +591,6 @@ int QWasmEventTranslator::wheel_cb(int eventType, const EmscriptenWheelEvent *wh bool accepted = QWindowSystemInterface::handleWheelEvent(window2, getTimestamp(), localPoint, globalPoint, QPoint(), pixelDelta, modifiers); - QWasmEventDispatcher::maintainTimers(); return static_cast<int>(accepted); } @@ -676,8 +674,6 @@ int QWasmEventTranslator::handleTouch(int eventType, const EmscriptenTouchEvent if (eventType == EMSCRIPTEN_EVENT_TOUCHCANCEL) accepted = QWindowSystemInterface::handleTouchCancelEvent(window2, getTimestamp(), touchDevice, keyModifier); - QWasmEventDispatcher::maintainTimers(); - return static_cast<int>(accepted); } @@ -873,8 +869,6 @@ bool QWasmEventTranslator::processKeyboard(int eventType, const EmscriptenKeyboa accepted = false; // continue on to event } - QWasmEventDispatcher::maintainTimers(); - return accepted; } |