From 45931aac0cc9e251923453b980d6466028e908eb Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Fri, 25 May 2012 13:28:22 +1000 Subject: 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 --- src/quick/items/qquickmultipointtoucharea.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/quick/items') 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(); } -- cgit v1.2.3