diff options
author | Martin Jones <martin.jones@nokia.com> | 2012-05-25 13:28:22 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-28 05:30:34 +0200 |
commit | 45931aac0cc9e251923453b980d6466028e908eb (patch) | |
tree | fa4339bf3ffc328b5b1a2bd5a55e9279cd29d878 /src/quick/items/qquickmultipointtoucharea.cpp | |
parent | 4d9bc3bb6a3b500013a569267dcdbd423ee50ac2 (diff) |
Flickable containing MultiPointTouchArea is unresponsive following touch.
MPTA was releasing the mouse grab when all touches were
released, causing the mouse release event to not be propagated
to its parents, who were then unable to correct their state.
Remove this code and allow the normal event handlers to do their
thing.
This is the same fix as was implemented for PinchArea in
9634dc440269fc03f825a6d18b371d8e612ba9ec
Change-Id: I2715677157f5838e3f81137f64765024cf2f0459
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickmultipointtoucharea.cpp')
-rw-r--r-- | src/quick/items/qquickmultipointtoucharea.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/quick/items/qquickmultipointtoucharea.cpp b/src/quick/items/qquickmultipointtoucharea.cpp index 369a0691ba..6f10ea77f1 100644 --- a/src/quick/items/qquickmultipointtoucharea.cpp +++ b/src/quick/items/qquickmultipointtoucharea.cpp @@ -398,9 +398,6 @@ void QQuickMultiPointTouchArea::touchEvent(QTouchEvent *event) //TODO: move to canvas _stealMouse = false; setKeepMouseGrab(false); - QQuickCanvas *c = canvas(); - if (c && c->mouseGrabberItem() == this) - ungrabMouse(); setKeepTouchGrab(false); ungrabTouchPoints(); } @@ -698,9 +695,6 @@ bool QQuickMultiPointTouchArea::childMouseEventFilter(QQuickItem *i, QEvent *eve //TODO: verify this behavior _stealMouse = false; setKeepMouseGrab(false); - QQuickCanvas *c = canvas(); - if (c && c->mouseGrabberItem() == this) - ungrabMouse(); setKeepTouchGrab(false); ungrabTouchPoints(); } |