summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-01-08 21:39:26 +0000
committerMike Krus <mike.krus@kdab.com>2017-01-09 13:20:58 +0000
commitea4c632e311c3ca9887fa683749e8e9c75044cfa (patch)
tree7ea2b75c2f0c30b89c08086897ab13e64033cced
parent58bc331a2c076513aeea195cb0d54d1d23bf16f0 (diff)
Clicked event only generated if pickers match
Only generate the click event if the press and release object pickers are the same. Task-number: QTBUG-57040 Change-Id: I95cfd57ddec52ca5339ed56604bcc4bf376e988d Reviewed-by: Antti Määttä <antti.maatta@qt.io>
-rw-r--r--src/render/jobs/pickboundingvolumejob.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp
index c2a3272b4..6f4e6e8d8 100644
--- a/src/render/jobs/pickboundingvolumejob.cpp
+++ b/src/render/jobs/pickboundingvolumejob.cpp
@@ -287,7 +287,8 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event,
m_currentPicker = HObjectPicker();
// Only send the release event if it was pressed
if (objectPicker->isPressed()) {
- objectPicker->onClicked(pickEvent);
+ if (lastCurrentPicker == objectPicker)
+ objectPicker->onClicked(pickEvent);
objectPicker->onReleased(pickEvent);
}
break;