summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-08-19 04:48:42 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-08-19 04:48:42 (GMT)
commit43bf17864ed1b9b31bc5205d2c477b43239f9300 (patch)
tree3dda944c019ea517809d90c939928c0d5a0b1c2d /src
parent2ca4d08efc444de985a9a7749e771dfcaa0e7683 (diff)
downloadQt-43bf17864ed1b9b31bc5205d2c477b43239f9300.zip
Qt-43bf17864ed1b9b31bc5205d2c477b43239f9300.tar.gz
Qt-43bf17864ed1b9b31bc5205d2c477b43239f9300.tar.bz2
Fix containsMouse and clicking in general when acceptsHover is false.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/fx/qfxmouseregion.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index 1125673..1da3c69 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -306,6 +306,7 @@ void QFxMouseRegion::mousePressEvent(QGraphicsSceneMouseEvent *event)
d->dragX = drag()->axis() & QFxDrag::XAxis;
d->dragY = drag()->axis() & QFxDrag::YAxis;
d->dragged = false;
+ setHovered(true);
d->start = event->pos();
d->startScene = event->scenePos();
// we should only start timer if pressAndHold is connected to.
@@ -393,6 +394,9 @@ void QFxMouseRegion::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
else {
d->saveEvent(event);
setPressed(false);
+ // If we don't accept hover, we need to reset containsMouse.
+ if (!acceptHoverEvents())
+ setHovered(false);
}
}