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

wasm: fix some coding style

Browse Source 
- shorten a couple extra long lines
 - add space between functions

Pick-to: 6.4
Change-Id: I14ad7448372ba50f4b0299535c4261a5bbf415b7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Lorn Potter 2022-06-15 14:31:23 +10:00
parent b3e3b12489
commit 4d25429746
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/platforms/wasm/qwasmcompositor.cpp
View File

@ -68,7 +68,8 @@ QWasmCompositor::QWasmCompositor(QWasmScreen *screen)
touchDevice = new QPointingDevice(
"touchscreen", 1, QInputDevice::DeviceType::TouchScreen,
QPointingDevice::PointerType::Finger,
QPointingDevice::Capability::Position | QPointingDevice::Capability::Area | QPointingDevice::Capability::NormalizedPosition,
QPointingDevice::Capability::Position | QPointingDevice::Capability::Area
| QPointingDevice::Capability::NormalizedPosition,
10, 0);
QWindowSystemInterface::registerInputDevice(touchDevice);
}
@ -655,7 +656,8 @@ void QWasmCompositor::drawItemPixmap(QPainter *painter, const QRect &rect, int a
QRect aligned = QRect(x, y, w, h);
QRect inter = aligned.intersected(rect);
painter->drawPixmap(inter.x(), inter.y(), pixmap, inter.x() - aligned.x(), inter.y() - aligned.y(), inter.width() * scale, inter.height() *scale);
painter->drawPixmap(inter.x(), inter.y(), pixmap, inter.x() - aligned.x(),
inter.y() - aligned.y(), inter.width() * scale, inter.height() *scale);
}
@ -1316,10 +1318,12 @@ void QWasmCompositor::leaveWindow(QWindow *window)
windowUnderMouse = nullptr;
QWindowSystemInterface::handleLeaveEvent<QWindowSystemInterface::SynchronousDelivery>(window);
}
void QWasmCompositor::enterWindow(QWindow *window, const QPoint &localPoint, const QPoint &globalPoint)
{
QWindowSystemInterface::handleEnterEvent<QWindowSystemInterface::SynchronousDelivery>(window, localPoint, globalPoint);
}
bool QWasmCompositor::processMouseEnter(const EmscriptenMouseEvent *mouseEvent)
{
Q_UNUSED(mouseEvent)
@ -1327,6 +1331,7 @@ bool QWasmCompositor::processMouseEnter(const EmscriptenMouseEvent *mouseEvent)
mouseInCanvas = true;
return true;
}
bool QWasmCompositor::processMouseLeave()
{
mouseInCanvas = false;