diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-07-29 09:29:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 04:08:13 +0200 |
| commit | 44f82f2078897270622581e1c3f385d12c3aba42 (patch) | |
| tree | 6ed42ab4fb990a8722dd35bf92dd45ec99a429c7 /src | |
| parent | 2b9cccc859edb271f84728350d1a7666bbba111f (diff) | |
Clicking on a disabled ListView's delegate breaks mouse interaction
A disabled Flickable should not filter children.
Change-Id: I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0
Fixes: QTBUG-20584
Reviewed-on: http://codereview.qt.nokia.com/2354
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/items/qsgflickable.cpp | 2 | ||||
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeflickable.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/items/qsgflickable.cpp b/src/declarative/items/qsgflickable.cpp index 2c04ab09c6..be6e97f363 100644 --- a/src/declarative/items/qsgflickable.cpp +++ b/src/declarative/items/qsgflickable.cpp @@ -1346,7 +1346,7 @@ bool QSGFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) bool QSGFlickable::childMouseEventFilter(QSGItem *i, QEvent *e) { Q_D(QSGFlickable); - if (!isVisible() || !d->interactive) + if (!isVisible() || !d->interactive || !isEnabled()) return QSGItem::childMouseEventFilter(i, e); switch (e->type()) { case QEvent::GraphicsSceneMousePress: diff --git a/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp b/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp index 34bbb89ab1..04e926ac46 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeflickable.cpp @@ -1579,7 +1579,7 @@ bool QDeclarative1Flickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) bool QDeclarative1Flickable::sceneEventFilter(QGraphicsItem *i, QEvent *e) { Q_D(QDeclarative1Flickable); - if (!isVisible() || !d->interactive) + if (!isVisible() || !d->interactive || !isEnabled()) return QDeclarativeItem::sceneEventFilter(i, e); switch (e->type()) { case QEvent::GraphicsSceneMousePress: |