diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2017-03-20 14:50:32 +0200 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2017-03-23 13:45:10 +0000 |
| commit | d18d6cb1989cf6925015da3860439e50e57bc30d (patch) | |
| tree | ce776a7d366ef8b4738e53d0d7541223c670dc70 /tests/auto/render/commons | |
| parent | a2adf9df3b0c31f7f7661a1f705b591c5b259ff8 (diff) | |
Fix scene2d mouse event coordinate calculation
Apply the window size and use correct texture coordinates.
Task-number: QTBUG-57253
Change-Id: Ibc5f7ef878baf938b1b3e3b7cfb4eba2cea38ad6
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/render/commons')
| -rw-r--r-- | tests/auto/render/commons/testrenderer.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/render/commons/testrenderer.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/render/commons/testrenderer.cpp b/tests/auto/render/commons/testrenderer.cpp index f318797ca..5304ff142 100644 --- a/tests/auto/render/commons/testrenderer.cpp +++ b/tests/auto/render/commons/testrenderer.cpp @@ -32,6 +32,7 @@ QT_BEGIN_NAMESPACE TestRenderer::TestRenderer() : m_changes(0) + , m_managers(nullptr) { } diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h index ecbec4aa3..74f529fa0 100644 --- a/tests/auto/render/commons/testrenderer.h +++ b/tests/auto/render/commons/testrenderer.h @@ -43,10 +43,10 @@ public: API api() const Q_DECL_OVERRIDE { return AbstractRenderer::OpenGL; } qint64 time() const Q_DECL_OVERRIDE { return 0; } void setTime(qint64 time) Q_DECL_OVERRIDE { Q_UNUSED(time); } - void setNodeManagers(Qt3DRender::Render::NodeManagers *managers) Q_DECL_OVERRIDE { Q_UNUSED(managers); } + void setNodeManagers(Qt3DRender::Render::NodeManagers *m) Q_DECL_OVERRIDE { m_managers = m; } void setServices(Qt3DCore::QServiceLocator *services) Q_DECL_OVERRIDE { Q_UNUSED(services); } void setSurfaceExposed(bool exposed) Q_DECL_OVERRIDE { Q_UNUSED(exposed); } - Qt3DRender::Render::NodeManagers *nodeManagers() const Q_DECL_OVERRIDE { return nullptr; } + Qt3DRender::Render::NodeManagers *nodeManagers() const Q_DECL_OVERRIDE { return m_managers; } Qt3DCore::QServiceLocator *services() const Q_DECL_OVERRIDE { return nullptr; } void initialize() Q_DECL_OVERRIDE {} void shutdown() Q_DECL_OVERRIDE {} @@ -81,6 +81,7 @@ public: protected: Qt3DRender::Render::AbstractRenderer::BackendNodeDirtySet m_changes; + Qt3DRender::Render::NodeManagers *m_managers; }; QT_END_NAMESPACE |