summaryrefslogtreecommitdiffstats
path: root/src/render/picking/objectpicker_p.h
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-01-16 21:29:51 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-01-21 22:17:51 +0000
commit63ee368eee8c9c18691ef9b0b5de783fe125f95e (patch)
treed74f21ec784b756bf51733357a8b3dc678248ab0 /src/render/picking/objectpicker_p.h
parent1cbe2c66d68502cfd84018fd0a38c7abd0a49f95 (diff)
Picking: restore early checks
5.8.0 removed early checks because it broke hover. Restoring early checks by looking for at least one enabled object picker that requires hover support. Added a flag to job that can be set by pickers when they are created, deleted or some property changed. This is used to lazily update the state flags for the early termination checks. Also removed the dirty flag handling as it was not used and never cleared. Task-number: QTBUG-57611 Change-Id: Ib5c60290ee016d8c1fd3f24f7ebacff412fec239 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/picking/objectpicker_p.h')
-rw-r--r--src/render/picking/objectpicker_p.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/render/picking/objectpicker_p.h b/src/render/picking/objectpicker_p.h
index f116aa332..2c2cc361e 100644
--- a/src/render/picking/objectpicker_p.h
+++ b/src/render/picking/objectpicker_p.h
@@ -70,10 +70,7 @@ public:
void cleanup();
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
- bool isDirty() const;
bool isPressed() const;
- void unsetDirty();
- void makeDirty();
bool isHoverEnabled() const;
bool isDragEnabled() const;
@@ -86,8 +83,8 @@ public:
private:
void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void notifyJob();
- bool m_isDirty;
bool m_isPressed;
bool m_hoverEnabled;
bool m_dragEnabled;