diff options
| author | Mike Krus <mike.krus@kdab.com> | 2017-04-24 21:36:12 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2017-04-25 15:36:19 +0000 |
| commit | 7bddeeef303d0b2c100f2b2a7c01bf311ab07335 (patch) | |
| tree | 64cc684fc8362702d68b758993bb0ace40b864cd | |
| parent | 5e87e5beee5cfeffaa344ea165fba59ea46f4c57 (diff) | |
Send move events when hover is enabled
Change-Id: I3bea4f27361dd4f51f8547c6d9d45c964f4fb5d3
Task-number: QTBUG-58607
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| -rw-r--r-- | src/render/jobs/pickboundingvolumejob.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index 7bd45587c..f6c469912 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -378,7 +378,7 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event, } case QEvent::MouseMove: { - if (objectPicker->isPressed() && objectPicker->isDragEnabled()) { + if ((objectPicker->isPressed() || objectPicker->isHoverEnabled()) && objectPicker->isDragEnabled()) { objectPicker->onMoved(pickEvent); } // fallthrough diff --git a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp index 07055d810..1d391101e 100644 --- a/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp +++ b/tests/auto/render/pickboundingvolumejob/tst_pickboundingvolumejob.cpp @@ -1145,7 +1145,10 @@ private Q_SLOTS: change = arbiter1.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "moved"); } else { + QVERIFY(arbiter2.events.size() > 1); change = arbiter2.events.first().staticCast<Qt3DCore::QPropertyUpdatedChange>(); + QCOMPARE(change->propertyName(), "moved"); + change = arbiter2.events.at(1).staticCast<Qt3DCore::QPropertyUpdatedChange>(); QCOMPARE(change->propertyName(), "entered"); } |