diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2021-10-18 11:23:33 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-03 12:23:18 +0000 |
| commit | ec28fe968554f866e124ff716c7c0a7444942d5e (patch) | |
| tree | eb17a3d22208ee8f20396f23f2313366d75c59f6 | |
| parent | bbb048f7a40d2a5fb2641c7c7f15ea2b6c609995 (diff) | |
ObjectPicker: markDirty(AllDirty) when we change the enabled property
Otherwise we would simply change it internally but this wouldn't lead
to any actual changes in how we handle pick events.
Change-Id: I71aedc74db538978a939620d053af3167fd67dc4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
(cherry picked from commit d32ff6b43b92474de495c88783a67b0b30211a7c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/render/picking/objectpicker.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/render/picking/objectpicker.cpp b/src/render/picking/objectpicker.cpp index 07a630857..00c67a846 100644 --- a/src/render/picking/objectpicker.cpp +++ b/src/render/picking/objectpicker.cpp @@ -81,13 +81,16 @@ void ObjectPicker::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstT if (!node) return; - BackendNode::syncFromFrontEnd(frontEnd, firstTime); - if (firstTime) { markDirty(AbstractRenderer::AllDirty); notifyJob(); } + if (isEnabled() != node->isEnabled()) { + markDirty(AbstractRenderer::AllDirty); + // We let QBackendNode::syncFromFrontEnd change the enabled property + } + if (node->isHoverEnabled() != m_hoverEnabled) { m_hoverEnabled = node->isHoverEnabled(); markDirty(AbstractRenderer::AllDirty); @@ -105,6 +108,8 @@ void ObjectPicker::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstT markDirty(AbstractRenderer::AllDirty); notifyJob(); } + + BackendNode::syncFromFrontEnd(frontEnd, firstTime); } void ObjectPicker::notifyJob() |