summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2017-03-13 09:32:53 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2017-05-09 08:59:31 +0000
commit337bc59bb3a162d1a64b05d1dc82b5ec4b99049d (patch)
treebe59c1e4147cdb5b3d54a01ad00f2839108cd6aa /src/core
parent1178d7538bced76d1475b214cd591d86609239f3 (diff)
Scene2D cleanup - register pick events when scene is initialized
The current model where mouseGrab is connected to picker signal doesn't work. The pressed event is not sent to scene2d item, because it is already lost when scene2d gets the grabMouse message where it registers to the picker events. This breaks the mouse event sequence (press-move-release) for the quick item. Instead hook to setScene of the node to message scene2d when the scene gets initialized and always register to the picker events. Task-number: QTBUG-58876 Change-Id: Ic9ca4b0899a030336ef20ff2cffbe10b567c36f5 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/aspects/qaspectengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp
index a3fda90b0..b9c9d2283 100644
--- a/src/core/aspects/qaspectengine.cpp
+++ b/src/core/aspects/qaspectengine.cpp
@@ -103,8 +103,8 @@ QAspectEnginePrivate::~QAspectEnginePrivate()
*/
void QAspectEnginePrivate::initNode(QNode *node)
{
- QNodePrivate::get(node)->setScene(m_scene);
m_scene->addObservable(node);
+ QNodePrivate::get(node)->setScene(m_scene);
}
void QAspectEnginePrivate::initEntity(QEntity *entity)