summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/kernel/qmacgesturerecognizer_mac.mm7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac.mm b/src/gui/kernel/qmacgesturerecognizer_mac.mm
index 583fc93..210d00b 100644
--- a/src/gui/kernel/qmacgesturerecognizer_mac.mm
+++ b/src/gui/kernel/qmacgesturerecognizer_mac.mm
@@ -192,9 +192,12 @@ QMacPanGestureRecognizer::filterEvent(QGesture *gesture, QObject *target, QEvent
}
break;}
case QEvent::TouchEnd: {
+ if (_panCanceled)
+ break;
+
const QTouchEvent *ev = static_cast<const QTouchEvent*>(event);
- if (!_panCanceled && ev->touchPoints().size() == 1)
- return QGestureRecognizer::GestureFinished;
+ if (ev->touchPoints().size() == 1)
+ return QGestureRecognizer::GestureFinished;
break;}
case QEvent::TouchUpdate: {
if (_panCanceled)