diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-09-23 13:25:44 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-09-23 17:33:21 +0200 |
commit | f423459ac1bb0b05ef87e6cfc314ff21acef5b5f (patch) | |
tree | 7965bd700f4124345d7a545ee33bd7245025c47c /src/quick/items/qquickwindow_p.h | |
parent | ab5df626bef9365089ce716ce476bccae1d0a04b (diff) |
Restore QQuickWindowPrivate::dragOverThreshold(d, axis, TouchPoint)
In 2f85907193ad934d911fe97f7000ecb0662de8cb we added the first version
of dragOverThreshold() for checking touchpoints. Then we turned it into
a template function in 558bb0e3bbbd3eaca52b02946374f2106c3a3872 along
with fixing a bug. This version is still in use in Qt Quick Controls 2:
dragOverThreshold(qreal, Qt::Axis, const QTouchEvent::TouchPoint *, int)
So now we restore it, keeping the bug fix, but not as a template function.
Since ab5df626bef9365089ce716ce476bccae1d0a04b, Pointer Handlers do not
need it for checking QQuickEventTouchPoints anymore.
Change-Id: I97b84f533f52fa67ccd15ba6eb3ee64a4fe1b668
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
Diffstat (limited to 'src/quick/items/qquickwindow_p.h')
-rw-r--r-- | src/quick/items/qquickwindow_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 5d44e28bac..6876662a81 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -288,6 +288,8 @@ public: static bool dragOverThreshold(qreal d, Qt::Axis axis, QMouseEvent *event, int startDragThreshold = -1); + static bool dragOverThreshold(qreal d, Qt::Axis axis, const QTouchEvent::TouchPoint *tp, int startDragThreshold = -1); + static bool dragOverThreshold(QVector2D delta); // data property |