summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-10-13 12:26:45 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-10-13 12:26:45 (GMT)
commitf40135a580c298fa01ac78fb3da121f13f75cdfb (patch)
treed25bc5aa55b54f4766410e55ef0185a35a3cc7bf /src
parentb6b6da647132f7fdf78d0601cbf7b411fda474f0 (diff)
downloadQt-f40135a580c298fa01ac78fb3da121f13f75cdfb.zip
Qt-f40135a580c298fa01ac78fb3da121f13f75cdfb.tar.gz
Qt-f40135a580c298fa01ac78fb3da121f13f75cdfb.tar.bz2
Mac: small code fix-up for the gesture commit 5 min ago.
Rev-By: trust me
Diffstat (limited to 'src')
-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)