diff options
| author | Mike Krus <mike.krus@kdab.com> | 2017-04-08 16:08:24 +0200 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2018-01-26 07:54:14 +0000 |
| commit | 7c8410c6dc325902160bb433044800ba02d44d12 (patch) | |
| tree | d41961a6d4f6993c85e746154f19c11440ab2cca /src/render/backend/renderer_p.h | |
| parent | e680fe041700296be5e6e4a132e2cfc6f54d4e77 (diff) | |
Handle multiple surfaces properly for picking
This fixes issues with picking when having multiple viewports and/or
multiple windows.
Now check that the mouse event actually hits inside the viewport extents.
Also track the source of events and check that the surface matches the
source of the event.
Remaining issue is overlapping viewports within the same window
Task-number: QTBUG-59567
Change-Id: I76a4ee2bec7300d893fef6040d89bf81f2109795
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/renderer_p.h')
| -rw-r--r-- | src/render/backend/renderer_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h index 6311f35d6..b18b78a7c 100644 --- a/src/render/backend/renderer_p.h +++ b/src/render/backend/renderer_p.h @@ -234,7 +234,7 @@ public: inline RenderStateSet *defaultRenderState() const { return m_defaultRenderStateSet; } - QList<QMouseEvent> pendingPickingEvents() const; + QList<QPair<QObject*, QMouseEvent>> pendingPickingEvents() const; QList<QKeyEvent> pendingKeyEvents() const; void addRenderCaptureSendRequest(Qt3DCore::QNodeId nodeId); |