AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSwipeGestureRecognizer: Prevent cancel in startup-phase.

Browse Source 
Replace the boolean 'started' member by an enumeration which indicates
the startup phase. While in that phase, do not cancel when pressed
points are detected for fewer than 3 touch points.

Task-number: QTBUG-15768
Change-Id: Ic57b19e3002392fb632f551f615d80ada9831d34
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2014-10-22 10:30:46 +02:00
parent 4d84c25157
commit ac4bab991b
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/kernel/qgesture_p.h
View File

@ -134,11 +134,17 @@ class QSwipeGesturePrivate : public QGesturePrivate
Q_DECLARE_PUBLIC(QSwipeGesture)
public:
enum State {
NoGesture,
Started,
ThreePointsReached
};
QSwipeGesturePrivate()
: horizontalDirection(QSwipeGesture::NoDirection),
verticalDirection(QSwipeGesture::NoDirection),
swipeAngle(0),
started(false), velocityValue(0)
state(NoGesture), velocityValue(0)
{
}
@ -150,7 +156,7 @@ public:
qreal swipeAngle;
QPoint lastPositions[3];
bool started;
State state;
qreal velocityValue;
QElapsedTimer time;
};

23
src/widgets/kernel/qstandardgestures.cpp
View File

@ -283,7 +283,7 @@ QGestureRecognizer::Result QSwipeGestureRecognizer::recognize(QGesture *state,
case QEvent::TouchBegin: {
d->velocityValue = 1;
d->time.start();
d->started = true;
d->state = QSwipeGesturePrivate::Started;
result = QGestureRecognizer::MayBeGesture;
break;
}
@ -297,9 +297,10 @@ QGestureRecognizer::Result QSwipeGestureRecognizer::recognize(QGesture *state,
}
case QEvent::TouchUpdate: {
const QTouchEvent *ev = static_cast<const QTouchEvent *>(event);
if (!d->started)
if (d->state == QSwipeGesturePrivate::NoGesture)
result = QGestureRecognizer::CancelGesture;
else if (ev->touchPoints().size() == 3) {
d->state = QSwipeGesturePrivate::ThreePointsReached;
QTouchEvent::TouchPoint p1 = ev->touchPoints().at(0);
QTouchEvent::TouchPoint p2 = ev->touchPoints().at(1);
QTouchEvent::TouchPoint p3 = ev->touchPoints().at(2);
@ -354,12 +355,18 @@ QGestureRecognizer::Result QSwipeGestureRecognizer::recognize(QGesture *state,
} else if (ev->touchPoints().size() > 3) {
result = QGestureRecognizer::CancelGesture;
} else { // less than 3 touch points
if (d->started && (ev->touchPointStates() & Qt::TouchPointPressed))
result = QGestureRecognizer::CancelGesture;
else if (d->started)
result = QGestureRecognizer::Ignore;
else
switch (d->state) {
case QSwipeGesturePrivate::NoGesture:
result = QGestureRecognizer::MayBeGesture;
break;
case QSwipeGesturePrivate::Started:
result = QGestureRecognizer::Ignore;
break;
case QSwipeGesturePrivate::ThreePointsReached:
result = (ev->touchPointStates() & Qt::TouchPointPressed)
? QGestureRecognizer::CancelGesture : QGestureRecognizer::Ignore;
break;
}
}
break;
}
@ -378,7 +385,7 @@ void QSwipeGestureRecognizer::reset(QGesture *state)
d->swipeAngle = 0;
d->lastPositions[0] = d->lastPositions[1] = d->lastPositions[2] = QPoint();
d->started = false;
d->state = QSwipeGesturePrivate::NoGesture;
d->velocityValue = 0;
d->time.invalidate();