Changeset View
Changeset View
Standalone View
Standalone View
libs/ui/input/wintab/qxcbconnection.cpp
Context not available. | |||||
582 | qreal tangentialPressure, qreal rotation, int z, qint64 uid, | 582 | qreal tangentialPressure, qreal rotation, int z, qint64 uid, | ||
---|---|---|---|---|---|
583 | Qt::KeyboardModifiers modifiers) | 583 | Qt::KeyboardModifiers modifiers) | ||
584 | { | 584 | { | ||
585 | qint64 timestamp = g_eventTimer.elapsed(); | 585 | qint64 timestamp = g_eventTimer.msecsSinceReference() + g_eventTimer.elapsed(); | ||
586 | 586 | | |||
587 | QWindowSystemInterfacePrivate::TabletEvent *e = | 587 | QWindowSystemInterfacePrivate::TabletEvent *e = | ||
588 | new QWindowSystemInterfacePrivate::TabletEvent(w, timestamp, local, global, device, pointerType, buttons, pressure, | 588 | new QWindowSystemInterfacePrivate::TabletEvent(w, timestamp, local, global, device, pointerType, buttons, pressure, | ||
Context not available. | |||||
682 | 682 | | |||
683 | void QWindowSystemInterface::handleTabletEnterProximityEvent(int device, int pointerType, qint64 uid) | 683 | void QWindowSystemInterface::handleTabletEnterProximityEvent(int device, int pointerType, qint64 uid) | ||
684 | { | 684 | { | ||
685 | qint64 timestamp = g_eventTimer.elapsed(); | 685 | qint64 timestamp = g_eventTimer.msecsSinceReference() + g_eventTimer.elapsed(); | ||
686 | 686 | | |||
687 | QTabletEvent ev(QEvent::TabletEnterProximity, QPointF(), QPointF(), | 687 | QTabletEvent ev(QEvent::TabletEnterProximity, QPointF(), QPointF(), | ||
688 | device, pointerType, 0, 0, 0, | 688 | device, pointerType, 0, 0, 0, | ||
Context not available. | |||||
694 | 694 | | |||
695 | void QWindowSystemInterface::handleTabletLeaveProximityEvent(int device, int pointerType, qint64 uid) | 695 | void QWindowSystemInterface::handleTabletLeaveProximityEvent(int device, int pointerType, qint64 uid) | ||
696 | { | 696 | { | ||
697 | qint64 timestamp = g_eventTimer.elapsed(); | 697 | qint64 timestamp = g_eventTimer.msecsSinceReference() + g_eventTimer.elapsed(); | ||
698 | 698 | | |||
699 | QTabletEvent ev(QEvent::TabletLeaveProximity, QPointF(), QPointF(), | 699 | QTabletEvent ev(QEvent::TabletLeaveProximity, QPointF(), QPointF(), | ||
700 | device, pointerType, 0, 0, 0, | 700 | device, pointerType, 0, 0, 0, | ||
Context not available. |