diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-07-25 14:04:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-26 05:54:37 +0200 |
| commit | 419296133aa68a317838e047b22513f1e5508b47 (patch) | |
| tree | e3a0597f6d9c83cc2ac06eba385decd3ec12ff62 /src/quick/items/qquickitem_p.h | |
| parent | 57485805057eda17008d14ca618e9c1f69a5a35d (diff) | |
Fix resolution of cursor when items are overlapping.
If MouseArea with cursorShapes are overlapping then cursor shape
of the foremost item under the mouse cursor should be shown, but because
the hover events are delivered to the foremost items first the opposite
is occuring. This makes QQuickWindow responsible for correctly setting
its own cursor instead of relying on items to work it out amongst
themselves.
Change-Id: Iedf144c583dfa3d1ff441e19db9601b5e171902a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index adfe384b25..9dc7344b89 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -342,6 +342,9 @@ public: QQuickLayoutMirroringAttached* layoutDirectionAttached; QQuickItemKeyFilter *keyHandler; mutable QQuickItemLayer *layer; +#ifndef QT_NO_CURSOR + QCursor cursor; +#endif QPointF userTransformOriginPoint; int effectRefCount; @@ -408,7 +411,8 @@ public: bool inheritMirrorFromItem:1; bool isAccessible:1; bool culled:1; - // bool dummy:2 + bool hasCursor:1; + // bool dummy:1 // Bit 32 enum DirtyType { |