summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-01-27 06:08:47 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-01-27 06:08:47 (GMT)
commit824f3425f4ee45d1e0c8e579b8f830690af75271 (patch)
treee09ed659e2ad285896d48c30e6a68d9d2cdcb263 /src
parentb043e1fb417353de3bfcb33fe8fb91c9d97b0f8c (diff)
downloadQt-824f3425f4ee45d1e0c8e579b8f830690af75271.zip
Qt-824f3425f4ee45d1e0c8e579b8f830690af75271.tar.gz
Qt-824f3425f4ee45d1e0c8e579b8f830690af75271.tar.bz2
Ignore mouse events when !interactive.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsflickable.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
index e87f624..42e992a 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
@@ -780,6 +780,8 @@ void QmlGraphicsFlickable::mousePressEvent(QGraphicsSceneMouseEvent *event)
if (d->interactive) {
d->handleMousePressEvent(event);
event->accept();
+ } else {
+ QmlGraphicsItem::mousePressEvent(event);
}
}
@@ -789,6 +791,8 @@ void QmlGraphicsFlickable::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
if (d->interactive) {
d->handleMouseMoveEvent(event);
event->accept();
+ } else {
+ QmlGraphicsItem::mouseMoveEvent(event);
}
}
@@ -800,6 +804,8 @@ void QmlGraphicsFlickable::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
d->handleMouseReleaseEvent(event);
event->accept();
ungrabMouse();
+ } else {
+ QmlGraphicsItem::mouseReleaseEvent(event);
}
}
@@ -1116,6 +1122,7 @@ bool QmlGraphicsFlickable::yflick() const
bool QmlGraphicsFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
{
Q_D(QmlGraphicsFlickable);
+ qDebug() << " fjdakfl";
QGraphicsSceneMouseEvent mouseEvent(event->type());
QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();