equal
deleted
inserted
replaced
438 } |
438 } |
439 if (event->PointerNumber() == 0) |
439 if (event->PointerNumber() == 0) |
440 state |= Qt::TouchPointPrimary; |
440 state |= Qt::TouchPointPrimary; |
441 touchPoint.setState(state); |
441 touchPoint.setState(state); |
442 |
442 |
443 QPointF screenPos = QPointF(event->iPosition.iX, event->iPosition.iY); |
443 QPointF screenPos = qwidget->mapToGlobal(QPoint(event->iPosition.iX, event->iPosition.iY)); |
444 touchPoint.setScreenPos(screenPos); |
444 touchPoint.setScreenPos(screenPos); |
445 touchPoint.setNormalizedPos(QPointF(screenPos.x() / screenGeometry.width(), |
445 touchPoint.setNormalizedPos(QPointF(screenPos.x() / screenGeometry.width(), |
446 screenPos.y() / screenGeometry.height())); |
446 screenPos.y() / screenGeometry.height())); |
447 |
447 |
448 touchPoint.setPressure(event->Pressure() / qreal(d->maxTouchPressure)); |
448 touchPoint.setPressure(event->Pressure() / qreal(d->maxTouchPressure)); |