From 34a584a34f9d3cc79b631c97b2bdfc2aae70b233 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Wed, 8 Feb 2023 15:11:50 +0100 Subject: [PATCH] Use mouseEventTypeFromEventType instead of duplicating it QWasmWindow::onNonClientEvent uses the same logic as mouseEventTypeFromEventType, thereby duplicating its logic. Use mouseEventTypeFromEventType instead. Change-Id: I8c70e053aa950eee02be57671678a15cab3445ee Reviewed-by: Lorn Potter Reviewed-by: Aleksandr Reviakin (cherry picked from commit 39589b057f8bdff944eec1bbd4ce1290d030e916) --- src/plugins/platforms/wasm/qwasmwindow.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 2b6c6738a5d..9e727be9e06 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -170,19 +170,8 @@ bool QWasmWindow::onNonClientEvent(const PointerEvent &event) dom::mapPoint(event.target, platformScreen()->element(), event.localPoint)); return QWindowSystemInterface::handleMouseEvent( window(), QWasmIntegration::getTimestamp(), window()->mapFromGlobal(pointInScreen), - pointInScreen, event.mouseButtons, event.mouseButton, ([event]() { - switch (event.type) { - case EventType::PointerDown: - return QEvent::NonClientAreaMouseButtonPress; - case EventType::PointerUp: - return QEvent::NonClientAreaMouseButtonRelease; - case EventType::PointerMove: - return QEvent::NonClientAreaMouseMove; - default: - Q_ASSERT(false); // notreached - return QEvent::None; - } - })(), + pointInScreen, event.mouseButtons, event.mouseButton, + MouseEvent::mouseEventTypeFromEventType(event.type, WindowArea::NonClient), event.modifiers); }