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 <lorn.potter@gmail.com> Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io> (cherry picked from commit 39589b057f8bdff944eec1bbd4ce1290d030e916)
This commit is contained in:
parent
b94acfdcbd
commit
34a584a34f
@ -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);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user