1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use mouseEventTypeFromEventType instead of duplicating it

Browse Source 
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:
Mikolaj Boc 2023-02-08 15:11:50 +01:00
parent b94acfdcbd
commit 34a584a34f
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/wasm/qwasmwindow.cpp
View File

@ -170,19 +170,8 @@ bool QWasmWindow::onNonClientEvent(const PointerEvent &event)
dom::mapPoint(event.target, platformScreen()->element(), event.localPoint)); dom::mapPoint(event.target, platformScreen()->element(), event.localPoint));
return QWindowSystemInterface::handleMouseEvent( return QWindowSystemInterface::handleMouseEvent(
window(), QWasmIntegration::getTimestamp(), window()->mapFromGlobal(pointInScreen), window(), QWasmIntegration::getTimestamp(), window()->mapFromGlobal(pointInScreen),
pointInScreen, event.mouseButtons, event.mouseButton, ([event]() { pointInScreen, event.mouseButtons, event.mouseButton,
switch (event.type) { MouseEvent::mouseEventTypeFromEventType(event.type, WindowArea::NonClient),
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;
}
})(),
event.modifiers); event.modifiers);
} }