From f40135a580c298fa01ac78fb3da121f13f75cdfb Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 13 Oct 2009 14:26:45 +0200 Subject: Mac: small code fix-up for the gesture commit 5 min ago. Rev-By: trust me --- src/gui/kernel/qmacgesturerecognizer_mac.mm | 7 +++++-- 1 file 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(event); - if (!_panCanceled && ev->touchPoints().size() == 1) - return QGestureRecognizer::GestureFinished; + if (ev->touchPoints().size() == 1) + return QGestureRecognizer::GestureFinished; break;} case QEvent::TouchUpdate: { if (_panCanceled) -- cgit v0.12