diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 144 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 220 |
2 files changed, 249 insertions, 115 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index b91b2d63d8..95b6a49018 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -74,16 +74,16 @@ QT_BEGIN_NAMESPACE /*! Constructs an enter event object. - The points \a localPos, \a windowPos and \a screenPos specify the + The points \a localPos, \a scenePos and \a globalPos specify the mouse cursor's position relative to the receiving widget or item, - window, and screen, respectively. + window, and screen or desktop, respectively. */ -QEnterEvent::QEnterEvent(const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos) +QEnterEvent::QEnterEvent(const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos) : QEvent(QEvent::Enter) , l(localPos) - , w(windowPos) - , s(screenPos) + , s(scenePos) + , g(globalPos) { } @@ -226,10 +226,10 @@ QInputEvent::~QInputEvent() \l{QInputEvent::modifiers()}{modifiers()} function, inherited from QInputEvent. - The functions pos(), x(), and y() give the cursor position - relative to the widget that receives the mouse event. If you - move the widget as a result of the mouse event, use the global - position returned by globalPos() to avoid a shaking motion. + The position() function gives the cursor position + relative to the widget or item that receives the mouse event. + If you move the widget as a result of the mouse event, use the + global position returned by globalPosition() to avoid a shaking motion. The QWidget::setEnabled() function can be used to enable or disable mouse and keyboard events for a widget. @@ -259,7 +259,7 @@ QInputEvent::~QInputEvent() The mouse and keyboard states at the time of the event are specified by \a buttons and \a modifiers. - The screenPos() is initialized to QCursor::pos(), which may not + The globalPosition() is initialized to QCursor::pos(), which may not be appropriate. Use the other constructor to specify the global position explicitly. */ @@ -268,7 +268,7 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton but : QInputEvent(type, modifiers), l(localPos), w(localPos), b(button), mouseState(buttons), caps(0) { #ifndef QT_NO_CURSOR - s = QCursor::pos(); + g = QCursor::pos(); #endif } @@ -282,7 +282,7 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton but The \a localPos is the mouse cursor's position relative to the receiving widget or item. The cursor's position in screen coordinates is - specified by \a screenPos. The window position is set to the same value + specified by \a globalPos. The window position is set to the same value as \a localPos. The \a button that caused the event is given as a value from the \l Qt::MouseButton enum. If the event \a type is \l MouseMove, the appropriate button for this event is @@ -291,10 +291,10 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton but modifiers. */ -QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos, +QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) - : QMouseEvent(type, localPos, localPos, screenPos, button, buttons, modifiers) + : QMouseEvent(type, localPos, localPos, globalPos, button, buttons, modifiers) {} /*! @@ -304,9 +304,9 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &scre QEvent::MouseButtonRelease, QEvent::MouseButtonDblClick, or QEvent::MouseMove. - The points \a localPos, \a windowPos and \a screenPos specify the + The points \a localPos, \a scenePos and \a globalPos specify the mouse cursor's position relative to the receiving widget or item, - window, and screen, respectively. + window, and screen or desktop, respectively. The \a button that caused the event is given as a value from the \l Qt::MouseButton enum. If the event \a @@ -316,10 +316,10 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &scre modifiers. */ -QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos, +QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers) - : QInputEvent(type, modifiers), l(localPos), w(windowPos), s(screenPos), b(button), mouseState(buttons), caps(0) + : QInputEvent(type, modifiers), l(localPos), w(scenePos), g(globalPos), b(button), mouseState(buttons), caps(0) {} /*! @@ -331,9 +331,9 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &wind QEvent::MouseButtonRelease, QEvent::MouseButtonDblClick, or QEvent::MouseMove. - The points \a localPos, \a windowPos and \a screenPos specify the + The points \a localPos, \a scenePos and \a globalPos specify the mouse cursor's position relative to the receiving widget or item, - window, and screen, respectively. + window, and screen or desktop, respectively. The \a button that caused the event is given as a value from the \l Qt::MouseButton enum. If the event \a type is \l MouseMove, @@ -344,10 +344,10 @@ QMouseEvent::QMouseEvent(Type type, const QPointF &localPos, const QPointF &wind The source of the event is specified by \a source. */ -QMouseEvent::QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos, +QMouseEvent::QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source) - : QMouseEvent(type, localPos, windowPos, screenPos, button, buttons, modifiers) + : QMouseEvent(type, localPos, scenePos, globalPos, button, buttons, modifiers) { QGuiApplicationPrivate::setMouseEventSource(this, source); } @@ -852,7 +852,7 @@ QWheelEvent::~QWheelEvent() \since 5.14 Returns the position of the mouse cursor relative to the widget - that received the event. + or item that received the event. If you move your widgets around in response to mouse events, use globalPosition() instead of this function. @@ -2472,17 +2472,17 @@ Qt::MouseButtons QTabletEvent::buttons() const /*! Constructs a native gesture event of type \a type originating from \a device. - The points \a localPos, \a windowPos and \a screenPos specify the + The points \a localPos, \a scenePos and \a globalPos specify the gesture position relative to the receiving widget or item, - window, and screen, respectively. + window, and screen or desktop, respectively. \a realValue is the \macos event parameter, \a sequenceId and \a intValue are the Windows event parameters. \since 5.10 */ -QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QTouchDevice *device, const QPointF &localPos, const QPointF &windowPos, - const QPointF &screenPos, qreal realValue, ulong sequenceId, quint64 intValue) +QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QTouchDevice *device, const QPointF &localPos, const QPointF &scenePos, + const QPointF &globalPos, qreal realValue, ulong sequenceId, quint64 intValue) : QInputEvent(QEvent::NativeGesture), mGestureType(type), - mLocalPos(localPos), mWindowPos(windowPos), mScreenPos(screenPos), mRealValue(realValue), + mLocalPos(localPos), mScenePos(scenePos), mGlobalPos(globalPos), mRealValue(realValue), mSequenceId(sequenceId), mIntValue(intValue), mDevice(device) { } @@ -4237,42 +4237,63 @@ Qt::TouchPointState QTouchEvent::TouchPoint::state() const } /*! + \fn QPointF QTouchEvent::pos() const + \deprecated in Qt 6.0. Use position() instead. + Returns the position of this touch point, relative to the widget - or QGraphicsItem that received the event. + or item that received the event. \sa startPos(), lastPos(), screenPos(), scenePos(), normalizedPos() */ -QPointF QTouchEvent::TouchPoint::pos() const + +/*! + Returns the position of this touch point, relative to the widget + or item that received the event. + + \sa startPos(), lastPos(), screenPos(), scenePos(), normalizedPos() +*/ +QPointF QTouchEvent::TouchPoint::position() const { return d->pos; } /*! - Returns the scene position of this touch point. + \fn QPointF QTouchEvent::scenePos() const + \deprecated in Qt 6.0. Use scenePosition() instead. +*/ - The scene position is the position in QGraphicsScene coordinates - if the QTouchEvent is handled by a QGraphicsItem::touchEvent() - reimplementation, and identical to the screen position for - widgets. +/*! + Returns the position of this touch point relative to the window or scene. + + The scene position is the position relative to QQuickWindow if handled in QQuickItem::event(), + in QGraphicsScene coordinates if handled by an override of QGraphicsItem::touchEvent(), + or the window position in widget applications. - \sa startScenePos(), lastScenePos(), pos() + \sa scenePressPosition(), position(), globalPosition() */ -QPointF QTouchEvent::TouchPoint::scenePos() const +QPointF QTouchEvent::TouchPoint::scenePosition() const { return d->scenePos; } /*! - Returns the screen position of this touch point. + \fn QPointF QTouchEvent::screenPos() const + \deprecated in Qt 6.0. Use globalPosition() instead. +*/ + +/*! + Returns the position of this touch point on the screen or virtual desktop. - \sa startScreenPos(), lastScreenPos(), pos() + \sa globalPressPosition(), position(), scenePosition() */ -QPointF QTouchEvent::TouchPoint::screenPos() const +QPointF QTouchEvent::TouchPoint::globalPosition() const { return d->screenPos; } /*! + \deprecated in Qt 6.0. Use globalPosition() instead. + Returns the normalized position of this touch point. The coordinates are normalized to the size of the touch device, @@ -4286,43 +4307,58 @@ QPointF QTouchEvent::TouchPoint::normalizedPos() const } /*! - Returns the starting position of this touch point, relative to the - widget or QGraphicsItem that received the event. + \fn QPointF QTouchEvent::startPos() const + \deprecated in Qt 6.0. Use pressPosition() instead. +*/ + +/*! + Returns the position at which this touch point was pressed, relative to the + widget or item that received the event. - \sa pos(), lastPos() + \sa position() */ -QPointF QTouchEvent::TouchPoint::startPos() const +QPointF QTouchEvent::TouchPoint::pressPosition() const { return d->startPos; } /*! - Returns the starting scene position of this touch point. + \fn QPointF QTouchEvent::sceneStartPos() const + \deprecated in Qt 6.0. Use scenePressPosition() instead. +*/ - The scene position is the position in QGraphicsScene coordinates - if the QTouchEvent is handled by a QGraphicsItem::touchEvent() - reimplementation, and identical to the screen position for - widgets. +/*! + Returns the scene position at which this touch point was pressed. - \sa scenePos(), lastScenePos() + The scene position is the position relative to QQuickWindow if handled in QQuickItem::event(), + in QGraphicsScene coordinates if handled by an override of QGraphicsItem::touchEvent(), + or the window position in widget applications. + + \sa scenePosition(), pressPosition(), globalPressPosition() */ -QPointF QTouchEvent::TouchPoint::startScenePos() const +QPointF QTouchEvent::TouchPoint::scenePressPosition() const { return d->startScenePos; } /*! + \fn QPointF QTouchEvent::startScreenPos() const + \deprecated in Qt 6.0. Use globalPressPosition() instead. +*/ + +/*! Returns the starting screen position of this touch point. - \sa screenPos(), lastScreenPos() + \sa globalPosition(), pressPosition(), scenePressPosition() */ -QPointF QTouchEvent::TouchPoint::startScreenPos() const +QPointF QTouchEvent::TouchPoint::globalPressPosition() const { return d->startScreenPos; } /*! - Returns the normalized starting position of this touch point. + \deprecated in Qt 6.0. Use globalPressPosition() instead. + Returns the normalized press position of this touch point. The coordinates are normalized to the size of the touch device, i.e. (0,0) is the top-left corner and (1,1) is the bottom-right corner. diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 648b6f2077..8ee0382c42 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -84,23 +84,38 @@ protected: class Q_GUI_EXPORT QEnterEvent : public QEvent { public: - QEnterEvent(const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos); + QEnterEvent(const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos); ~QEnterEvent(); +#if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES - inline QPoint pos() const { return l.toPoint(); } - inline QPoint globalPos() const { return s.toPoint(); } - inline int x() const { return qRound(l.x()); } - inline int y() const { return qRound(l.y()); } - inline int globalX() const { return qRound(s.x()); } - inline int globalY() const { return qRound(s.y()); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline QPoint pos() const { return position().toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline QPoint globalPos() const { return globalPosition().toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline int x() const { return qRound(position().x()); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline int y() const { return qRound(position().y()); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline int globalX() const { return qRound(globalPosition().x()); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline int globalY() const { return qRound(globalPosition().y()); } #endif - const QPointF &localPos() const { return l; } - const QPointF &windowPos() const { return w; } - const QPointF &screenPos() const { return s; } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + QPointF localPos() const { return position(); } + QT_DEPRECATED_VERSION_X_6_0("Use scenePosition()") + QPointF windowPos() const { return scenePosition(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + QPointF screenPos() const { return globalPosition(); } +#endif // QT_DEPRECATED_SINCE(6, 0) + + QPointF position() const { return l; } + QPointF scenePosition() const { return s; } + QPointF globalPosition() const { return g; } protected: - QPointF l, w, s; + QPointF l, s, g; }; class Q_GUI_EXPORT QMouseEvent : public QInputEvent @@ -108,28 +123,44 @@ class Q_GUI_EXPORT QMouseEvent : public QInputEvent public: QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers); - QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos, + QMouseEvent(Type type, const QPointF &localPos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers); - QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos, + QMouseEvent(Type type, const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers); - QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos, + QMouseEvent(Type type, const QPointF &localPos, const QPointF &scenePos, const QPointF &globalPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source); ~QMouseEvent(); #ifndef QT_NO_INTEGER_EVENT_COORDINATES - inline QPoint pos() const { return l.toPoint(); } - inline QPoint globalPos() const { return s.toPoint(); } - inline int x() const { return qRound(l.x()); } - inline int y() const { return qRound(l.y()); } - inline int globalX() const { return qRound(s.x()); } - inline int globalY() const { return qRound(s.y()); } + inline QPoint pos() const { return position().toPoint(); } #endif - const QPointF &localPos() const { return l; } - const QPointF &windowPos() const { return w; } - const QPointF &screenPos() const { return s; } +#if QT_DEPRECATED_SINCE(6, 0) +#ifndef QT_NO_INTEGER_EVENT_COORDINATES + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline QPoint globalPos() const { return globalPosition().toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline int x() const { return qRound(position().x()); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline int y() const { return qRound(position().y()); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline int globalX() const { return qRound(globalPosition().x()); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline int globalY() const { return qRound(globalPosition().y()); } +#endif // QT_NO_INTEGER_EVENT_COORDINATES + QT_DEPRECATED_VERSION_X_6_0("Use position()") + QPointF localPos() const { return position(); } + QT_DEPRECATED_VERSION_X_6_0("Use scenePosition()") + QPointF windowPos() const { return scenePosition(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + QPointF screenPos() const { return globalPosition(); } +#endif // QT_DEPRECATED_SINCE(6, 0) + + QPointF position() const { return l; } + QPointF scenePosition() const { return w; } + QPointF globalPosition() const { return g; } inline Qt::MouseButton button() const { return b; } inline Qt::MouseButtons buttons() const { return mouseState; } @@ -140,7 +171,7 @@ public: Qt::MouseEventFlags flags() const; protected: - QPointF l, w, s; + QPointF l, w, g; Qt::MouseButton b; Qt::MouseButtons mouseState; int caps; @@ -155,13 +186,21 @@ public: QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier); ~QHoverEvent(); +#if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES - inline QPoint pos() const { return p.toPoint(); } - inline QPoint oldPos() const { return op.toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline QPoint pos() const { return position().toPoint(); } #endif - inline const QPointF &posF() const { return p; } - inline const QPointF &oldPosF() const { return op; } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline QPointF posF() const { return position(); } +#endif // QT_DEPRECATED_SINCE(6, 0) + + // TODO deprecate when we figure out an actual replacement (point history?) + inline QPoint oldPos() const { return op.toPoint(); } + inline QPointF oldPosF() const { return op; } + + QPointF position() const { return p; } protected: QPointF p, op; @@ -224,16 +263,31 @@ public: Qt::MouseButton button, Qt::MouseButtons buttons); ~QTabletEvent(); - inline QPoint pos() const { return mPos.toPoint(); } - inline QPoint globalPos() const { return mGPos.toPoint(); } - - inline const QPointF &posF() const { return mPos; } - inline const QPointF &globalPosF() const { return mGPos; } - - inline int x() const { return qRound(mPos.x()); } - inline int y() const { return qRound(mPos.y()); } - inline int globalX() const { return qRound(mGPos.x()); } - inline int globalY() const { return qRound(mGPos.y()); } +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline QPoint pos() const { return position().toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline QPoint globalPos() const { return globalPosition().toPoint(); } + + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline const QPointF posF() const { return position(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + inline const QPointF globalPosF() const { return globalPosition(); } + QT_DEPRECATED_VERSION_X_6_0("Use position().x()") + inline int x() const { return qRound(position().x()); } + QT_DEPRECATED_VERSION_X_6_0("Use position().y()") + inline int y() const { return qRound(position().y()); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition().x()") + inline int globalX() const { return qRound(globalPosition().x()); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition().y()") + inline int globalY() const { return qRound(globalPosition().y()); } + QT_DEPRECATED_VERSION_X_6_0("use globalPosition().x()") + inline qreal hiResGlobalX() const { return globalPosition().x(); } + QT_DEPRECATED_VERSION_X_6_0("use globalPosition().y()") + inline qreal hiResGlobalY() const { return globalPosition().y(); } +#endif + inline QPointF position() const { return mPos; } + inline QPointF globalPosition() const { return mGPos; } inline TabletDevice deviceType() const { return TabletDevice(mDev); } inline PointerType pointerType() const { return PointerType(mPointerType); } inline qint64 uniqueId() const { return mUnique; } @@ -262,27 +316,38 @@ protected: class Q_GUI_EXPORT QNativeGestureEvent : public QInputEvent { public: - QNativeGestureEvent(Qt::NativeGestureType type, const QTouchDevice *dev, const QPointF &localPos, const QPointF &windowPos, - const QPointF &screenPos, qreal value, ulong sequenceId, quint64 intArgument); + QNativeGestureEvent(Qt::NativeGestureType type, const QTouchDevice *dev, const QPointF &localPos, const QPointF &scenePos, + const QPointF &globalPos, qreal value, ulong sequenceId, quint64 intArgument); ~QNativeGestureEvent(); Qt::NativeGestureType gestureType() const { return mGestureType; } qreal value() const { return mRealValue; } +#if QT_DEPRECATED_SINCE(6, 0) #ifndef QT_NO_INTEGER_EVENT_COORDINATES - inline const QPoint pos() const { return mLocalPos.toPoint(); } - inline const QPoint globalPos() const { return mScreenPos.toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use position().toPoint()") + inline const QPoint pos() const { return position().toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition().toPoint()") + inline const QPoint globalPos() const { return globalPosition().toPoint(); } #endif - const QPointF &localPos() const { return mLocalPos; } - const QPointF &windowPos() const { return mWindowPos; } - const QPointF &screenPos() const { return mScreenPos; } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + QPointF localPos() const { return position(); } + QT_DEPRECATED_VERSION_X_6_0("Use scenePosition()") + QPointF windowPos() const { return scenePosition(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + QPointF screenPos() const { return globalPosition(); } +#endif + + QPointF position() const { return mLocalPos; } + QPointF scenePosition() const { return mScenePos; } + QPointF globalPosition() const { return mGlobalPos; } const QTouchDevice *device() const { return mDevice; } protected: Qt::NativeGestureType mGestureType; QPointF mLocalPos; - QPointF mWindowPos; - QPointF mScreenPos; + QPointF mScenePos; + QPointF mGlobalPos; qreal mRealValue; ulong mSequenceId; quint64 mIntValue; @@ -551,10 +616,20 @@ public: Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = Drop); ~QDropEvent(); - inline QPoint pos() const { return p.toPoint(); } - inline const QPointF &posF() const { return p; } - inline Qt::MouseButtons mouseButtons() const { return mouseState; } - inline Qt::KeyboardModifiers keyboardModifiers() const { return modState; } +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED_VERSION_X_6_0("Use position().toPoint()") + inline QPoint pos() const { return position().toPoint(); } + QT_DEPRECATED_VERSION_X_6_0("Use position()") + inline QPointF posF() const { return position(); } + QT_DEPRECATED_VERSION_X_6_0("Use buttons()") + inline Qt::MouseButtons mouseButtons() const { return buttons(); } + QT_DEPRECATED_VERSION_X_6_0("Use modifiers()") + inline Qt::KeyboardModifiers keyboardModifiers() const { return modifiers(); } +#endif // QT_DEPRECATED_SINCE(6, 0) + + QPointF position() const { return p; } + inline Qt::MouseButtons buttons() const { return mouseState; } + inline Qt::KeyboardModifiers modifiers() const { return modState; } inline Qt::DropActions possibleActions() const { return act; } inline Qt::DropAction proposedAction() const { return default_action; } @@ -809,22 +884,40 @@ public: Qt::TouchPointState state() const; - QPointF pos() const; - QPointF startPos() const; - QPointF lastPos() const; +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED_VERSION_X_6_0("Use position()") + QPointF pos() const { return position(); } + QT_DEPRECATED_VERSION_X_6_0("Use pressPosition()") + QPointF startPos() const { return pressPosition(); } - QPointF scenePos() const; - QPointF startScenePos() const; - QPointF lastScenePos() const; + QT_DEPRECATED_VERSION_X_6_0("Use scenePosition()") + QPointF scenePos() const { return scenePosition(); } + QT_DEPRECATED_VERSION_X_6_0("Use scenePressPosition()") + QPointF startScenePos() const { return scenePressPosition(); } - QPointF screenPos() const; - QPointF startScreenPos() const; - QPointF lastScreenPos() const; + QT_DEPRECATED_VERSION_X_6_0("Use globalPosition()") + QPointF screenPos() const { return globalPosition(); } + QT_DEPRECATED_VERSION_X_6_0("Use globalPressPosition()") + QPointF startScreenPos() const { return globalPressPosition(); } +#endif // QT_DEPRECATED_SINCE(6, 0) + // TODO deprecate these after finding good replacements (use QPointingDevice::globalArea?) QPointF normalizedPos() const; QPointF startNormalizedPos() const; + + // TODO deprecate these after finding good replacements (store longer history perhaps?) + QPointF lastPos() const; + QPointF lastScenePos() const; + QPointF lastScreenPos() const; QPointF lastNormalizedPos() const; + QPointF position() const; + QPointF pressPosition() const; + QPointF scenePosition() const; + QPointF scenePressPosition() const; + QPointF globalPosition() const; + QPointF globalPressPosition() const; + qreal pressure() const; qreal rotation() const; QSizeF ellipseDiameters() const; @@ -834,6 +927,8 @@ public: QVector<QPointF> rawScreenPositions() const; // internal + // ### Qt 6: move private, rename appropriately, only friends can call them +#if QT_DEPRECATED_SINCE(6, 0) void setId(int id); void setUniqueId(qint64 uid); void setState(Qt::TouchPointStates state); @@ -855,6 +950,7 @@ public: void setVelocity(const QVector2D &v); void setFlags(InfoFlags flags); void setRawScreenPositions(const QVector<QPointF> &positions); +#endif // QT_DEPRECATED_SINCE(6, 0) private: QTouchEventTouchPointPrivate *d; @@ -879,12 +975,14 @@ public: inline const QList<QTouchEvent::TouchPoint> &touchPoints() const { return _touchPoints; } inline QTouchDevice *device() const { return _device; } - // internal + // ### Qt 6: move private, rename appropriately, only friends can call them; or just let friends modify variables directly +#if QT_DEPRECATED_SINCE(6, 0) inline void setWindow(QWindow *awindow) { _window = awindow; } inline void setTarget(QObject *atarget) { _target = atarget; } inline void setTouchPointStates(Qt::TouchPointStates aTouchPointStates) { _touchPointStates = aTouchPointStates; } inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &atouchPoints) { _touchPoints = atouchPoints; } inline void setDevice(QTouchDevice *adevice) { _device = adevice; } +#endif // QT_DEPRECATED_SINCE(6, 0) protected: QWindow *_window; |