diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-07-02 11:50:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-04 05:20:23 +0200 |
| commit | 0c368a5e88eaeafe17b862ac90bc3852d04ea811 (patch) | |
| tree | c7da8943c369bc6d5d289af49af8ee0f17b37a6f /src/quick/items/qquickmousearea.cpp | |
| parent | ece79ecd0ae553ec66bb40a61c00507e466bc5e6 (diff) | |
Report correct mouse position when made visible with hoverEnabled.
Task-number: QTBUG-24282
Change-Id: I778b2db18c28e2b33690531ec19eb24ecf444a38
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index 6897e3d904..a2522a4f47 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -47,6 +47,8 @@ #include <private/qqmldata_p.h> +#include <QtGui/private/qguiapplication_p.h> + #include <QtGui/qevent.h> #include <QtGui/qguiapplication.h> #include <QtGui/qstylehints.h> @@ -1057,8 +1059,14 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value) Q_D(QQuickMouseArea); switch (change) { case ItemVisibleHasChanged: - if (acceptHoverEvents() && d->hovered != (isVisible() && isUnderMouse())) + if (acceptHoverEvents() && d->hovered != (isVisible() && isUnderMouse())) { + if (!d->hovered) { + QPointF cursorPos = QGuiApplicationPrivate::lastCursorPosition; + d->lastScenePos = d->canvas->mapFromGlobal(cursorPos.toPoint()); + d->lastPos = mapFromScene(d->lastScenePos); + } setHovered(!d->hovered); + } break; default: break; |