diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-08-01 16:20:26 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-02 06:42:28 +0200 |
| commit | 1b65161042108ee46ca42331dacc2b66b63c6b4e (patch) | |
| tree | 86827961301d01d59bbe72b944373293d8409984 /src/declarative/items/qsgcanvas_p.h | |
| parent | 9dfd621aec9a031297c50dd7df5ca90c771f46a3 (diff) | |
Allow descendant chains to simultaneously be hovered.
Matches GV behaviour. Also fixes a bug in QSGMouseArea,
which we aren't fixing for QtQuick 1.
Task-number: QTBUG-18175
Change-Id: I4ecac7b908504f28de830732c731281407d7b0bc
Reviewed-on: http://codereview.qt.nokia.com/2422
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/declarative/items/qsgcanvas_p.h')
| -rw-r--r-- | src/declarative/items/qsgcanvas_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h index 20fc332e1b..d26b311e59 100644 --- a/src/declarative/items/qsgcanvas_p.h +++ b/src/declarative/items/qsgcanvas_p.h @@ -117,11 +117,11 @@ public: bool deliverHoverEvent(QSGItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool &accepted); bool sendHoverEvent(QEvent::Type, QSGItem *, const QPointF &scenePos, const QPointF &lastScenePos, Qt::KeyboardModifiers modifiers, bool accepted); - void clearHover(); + bool clearHover(); void deliverDragEvent(QSGDragEvent *); bool deliverDragEvent(QSGItem *item, QSGDragEvent *); - QDeclarativeGuard<QSGItem> hoverItem; + QList<QSGItem*> hoverItems; enum FocusOption { DontChangeFocusProperty = 0x01, }; |