From b3dbea5da34edb28a007ea7796de30204021a902 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Mon, 27 Apr 2009 13:15:59 +0200
Subject: Fixed gesture event propagation to QGraphicsItems.
---
src/gui/graphicsview/qgraphicsscene.cpp | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 337b6ee..7bac21c 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -247,6 +247,7 @@ static const int QGRAPHICSSCENE_INDEXTIMER_TIMEOUT = 2000;
#ifdef Q_WS_X11
#include <private/qt_x11_p.h>
#endif
+#include <private/qgesturemanager_p.h>
QT_BEGIN_NAMESPACE
@@ -3962,23 +3963,27 @@ bool QGraphicsScene::event(QEvent *event)
// find graphics items that intersects with gestures hot spots.
QPolygonF poly;
- QMap<int, QPointF> sceneHotSpots;
+ QMap<QString, QPointF> sceneHotSpots;
foreach(const QString &type, gestureTypes) {
QPointF pt = ev->mapToScene(ev->gesture(type)->hotSpot());
- sceneHotSpots.insert(qHash(type), pt);
+ sceneHotSpots.insert(type, pt);
poly << pt;
}
QList<QGraphicsItem*> itemsInGestureArea = items(poly, Qt::IntersectsItemBoundingRect);
foreach(QGraphicsItem *item, itemsInGestureArea) {
- QMap<int, QPointF>::const_iterator it = sceneHotSpots.begin(),
- e = sceneHotSpots.end();
+ QMap<QString, QPointF>::const_iterator it = sceneHotSpots.begin(),
+ e = sceneHotSpots.end();
for(; it != e; ++it) {
- if (item->contains(item->mapFromScene(it.value())) &&
- item->d_ptr->gestures.contains(it.key())) {
- d->sendEvent(item, ev);
- if (ev->isAccepted())
- break;
+ if (item->contains(item->mapFromScene(it.value()))) {
+ const QString gestureName = it.key();
+ foreach(int gestureId, item->d_ptr->gestures) {
+ if (QGestureManager::instance()->gestureNameFromId(gestureId) == gestureName) {
+ d->sendEvent(item, ev);
+ if (ev->isAccepted())
+ break;
+ }
+ }
}
}
}
--
cgit v0.12