diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-08-23 13:30:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 06:06:14 +0200 |
| commit | 1d445eb5b1a14da342382a088f4e1cc5492ea32e (patch) | |
| tree | 6e53b89f8d944b9b4b269c1bc4eeee09e3f2ac6f /src/declarative/items/qquickcanvas.cpp | |
| parent | cae9402e7bda876e83aa0d5ef4ba0f4ee0d0eca0 (diff) | |
Add MultiPointTouchArea element.
Change-Id: I3a4f774cd96ab7f5d08e85c965f59e1416f02e0e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/items/qquickcanvas.cpp')
| -rw-r--r-- | src/declarative/items/qquickcanvas.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/declarative/items/qquickcanvas.cpp b/src/declarative/items/qquickcanvas.cpp index 52ef421213..6df0c65c94 100644 --- a/src/declarative/items/qquickcanvas.cpp +++ b/src/declarative/items/qquickcanvas.cpp @@ -1496,7 +1496,7 @@ bool QQuickCanvasPrivate::deliverDragEvent(QQuickDragGrabber *grabber, QQuickIte return accepted; } -bool QQuickCanvasPrivate::sendFilteredMouseEvent(QQuickItem *target, QQuickItem *item, QMouseEvent *event) +bool QQuickCanvasPrivate::sendFilteredMouseEvent(QQuickItem *target, QQuickItem *item, QEvent *event) { if (!target) return false; @@ -1550,12 +1550,9 @@ bool QQuickCanvas::sendEvent(QQuickItem *item, QEvent *e) case QEvent::MouseButtonDblClick: case QEvent::MouseMove: // XXX todo - should sendEvent be doing this? how does it relate to forwarded events? - { - QMouseEvent *se = static_cast<QMouseEvent *>(e); - if (!d->sendFilteredMouseEvent(item->parentItem(), item, se)) { - se->accept(); - QQuickItemPrivate::get(item)->deliverMouseEvent(se); - } + if (!d->sendFilteredMouseEvent(item->parentItem(), item, e)) { + e->accept(); + QQuickItemPrivate::get(item)->deliverMouseEvent(static_cast<QMouseEvent *>(e)); } break; case QEvent::Wheel: @@ -1569,7 +1566,11 @@ bool QQuickCanvas::sendEvent(QQuickItem *item, QEvent *e) case QEvent::TouchBegin: case QEvent::TouchUpdate: case QEvent::TouchEnd: - QQuickItemPrivate::get(item)->deliverTouchEvent(static_cast<QTouchEvent *>(e)); + // XXX todo - should sendEvent be doing this? how does it relate to forwarded events? + if (!d->sendFilteredMouseEvent(item->parentItem(), item, e)) { + e->accept(); + QQuickItemPrivate::get(item)->deliverTouchEvent(static_cast<QTouchEvent *>(e)); + } break; case QEvent::DragEnter: case QEvent::DragMove: |