diff options
author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-07-03 12:29:57 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 02:45:03 +0200 |
commit | 9bf96613c1be7d4df7132a9c3c9ac1a8740f698f (patch) | |
tree | 351c19417586bf5ec688af3f8b40f91c9f1d1a5e /src/quick/items/qquickcanvas.cpp | |
parent | fc909a49d3e8fa2132bf0951499a1d5cb1d541ca (diff) |
Allow mouse interaction with 0 opacity items.
Don't filter event delivery to items with 0 opacity, and update the
documentation the for opacity, visible and enabled properties and how
each affects event delivery.
Task-number: QTBUG-19193
Change-Id: Id48e4af763c9a7bbcc13b303342d303155dcadc9
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickcanvas.cpp')
-rw-r--r-- | src/quick/items/qquickcanvas.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index a242ca1111..7e0f482ee0 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -1146,8 +1146,6 @@ bool QQuickCanvasPrivate::deliverInitialMousePressEvent(QQuickItem *item, QMouse Q_Q(QQuickCanvas); QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - if (itemPrivate->opacity() == 0.0) - return false; if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) { QPointF p = item->mapFromScene(event->windowPos()); @@ -1306,8 +1304,6 @@ bool QQuickCanvasPrivate::deliverHoverEvent(QQuickItem *item, const QPointF &sce Qt::KeyboardModifiers modifiers, bool &accepted) { QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - if (itemPrivate->opacity() == 0.0) - return false; if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) { QPointF p = item->mapFromScene(scenePos); @@ -1374,8 +1370,6 @@ bool QQuickCanvasPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event { Q_Q(QQuickCanvas); QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - if (itemPrivate->opacity() == 0.0) - return false; if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) { QPointF p = item->mapFromScene(event->posF()); @@ -1514,9 +1508,6 @@ bool QQuickCanvasPrivate::deliverTouchPoints(QQuickItem *item, QTouchEvent *even { QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - if (qFuzzyIsNull(itemPrivate->opacity())) - return false; - if (itemPrivate->flags & QQuickItem::ItemClipsChildrenToShape) { for (int i=0; i<newPoints.count(); i++) { QPointF p = item->mapFromScene(newPoints[i].scenePos()); @@ -1770,7 +1761,7 @@ bool QQuickCanvasPrivate::deliverDragEvent(QQuickDragGrabber *grabber, QQuickIte Q_Q(QQuickCanvas); bool accepted = false; QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item); - if (itemPrivate->opacity() == 0.0 || !item->isVisible() || !item->isEnabled()) + if (!item->isVisible() || !item->isEnabled()) return false; QPointF p = item->mapFromScene(event->pos()); |