diff options
author | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-07-15 09:11:11 +0200 |
---|---|---|
committer | Mikolaj Boc <mikolaj.boc@qt.io> | 2022-07-25 14:40:40 +0200 |
commit | 5a4e5c62af0d462e0c26d691d3971e82f3241f4b (patch) | |
tree | 863487079e4e8f7903652bb4e5b80f9149fa4fe8 /src/plugins/platforms/wasm/qwasmevent.cpp | |
parent | 57b4e30ff8841da682cc5e27c2b4abf571838e32 (diff) |
Improve window dragging on WASM
Window dragging has been considerably improved by replacing the mouse
events by pointer events and placing a pointer lock on WASM canvas, so
that off-browser window events are delivered to us.
Translation of the drag origin has been limited to inside the canvas, so
that a window cannot be dragged so far that it becomes offscreen and is
unreachable.
Change-Id: Id177c630a6466f04464a513371d6b97d3a098b6a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/platforms/wasm/qwasmevent.cpp')
-rw-r--r-- | src/plugins/platforms/wasm/qwasmevent.cpp | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/src/plugins/platforms/wasm/qwasmevent.cpp b/src/plugins/platforms/wasm/qwasmevent.cpp new file mode 100644 index 0000000000..b094dbfe14 --- /dev/null +++ b/src/plugins/platforms/wasm/qwasmevent.cpp @@ -0,0 +1,53 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + +#include "qwasmevent.h" + +QT_BEGIN_NAMESPACE + +namespace KeyboardModifier +{ +template <> +QFlags<Qt::KeyboardModifier> getForEvent<EmscriptenKeyboardEvent>( + const EmscriptenKeyboardEvent& event) +{ + return internal::Helper<EmscriptenKeyboardEvent>::getModifierForEvent(event) | + (event.location == DOM_KEY_LOCATION_NUMPAD ? Qt::KeypadModifier : Qt::NoModifier); +} +} // namespace KeyboardModifier + +std::optional<PointerEvent> PointerEvent::fromWeb(emscripten::val event) +{ + PointerEvent ret; + + const auto eventType = ([&event]() -> std::optional<EventType> { + const auto eventTypeString = event["type"].as<std::string>(); + + if (eventTypeString == "pointermove") + return EventType::PointerMove; + else if (eventTypeString == "pointerup") + return EventType::PointerUp; + else if (eventTypeString == "pointerdown") + return EventType::PointerDown; + else if (eventTypeString == "pointerenter") + return EventType::PointerEnter; + else if (eventTypeString == "pointerleave") + return EventType::PointerLeave; + return std::nullopt; + })(); + if (!eventType) + return std::nullopt; + + ret.type = *eventType; + ret.pointerType = event["pointerType"].as<std::string>() == "mouse" ? + PointerType::Mouse : PointerType::Other; + ret.mouseButton = MouseEvent::buttonFromWeb(event["button"].as<int>()); + ret.mouseButtons = MouseEvent::buttonsFromWeb(event["buttons"].as<unsigned short>()); + ret.point = QPoint(event["x"].as<int>(), event["y"].as<int>()); + ret.pointerId = event["pointerId"].as<int>(); + ret.modifiers = KeyboardModifier::getForEvent(event); + + return ret; +} + +QT_END_NAMESPACE |