diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-21 13:23:26 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-02-21 13:31:27 +0200 |
commit | 57db4ab218a4e43bbdee64f9de226f77aa0f9b24 (patch) | |
tree | 3ab807197669e5222d2925785ecefc917ec7ff82 | |
parent | 1b6d1a300cb4528fd01dc4255b59524a0e446505 (diff) |
Fixed retina problems with FBO rendering
Task-number: QTRD-2890
Change-Id: I9cd5de30dd58b78adc0e065742ed689f16b630f1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 3 | ||||
-rw-r--r-- | src/datavisualizationqml2/declarativerendernode.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 09e6cabf..4bd75f57 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -136,7 +136,7 @@ AbstractDeclarative::RenderingMode AbstractDeclarative::renderingMode() const QSGNode *AbstractDeclarative::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) { - QSize boundingSize = boundingRect().size().toSize(); + QSize boundingSize = boundingRect().size().toSize() * m_controller->scene()->devicePixelRatio(); if (boundingSize.width() <= 0 || boundingSize.height() <= 0 || m_controller.isNull() || !window()) { delete oldNode; @@ -357,7 +357,6 @@ void AbstractDeclarative::updateWindowParameters() else windowSize = m_cachedGeometry.size().toSize(); - if (windowSize != scene->d_ptr->windowSize()) { scene->d_ptr->setWindowSize(windowSize); win->update(); diff --git a/src/datavisualizationqml2/declarativerendernode.cpp b/src/datavisualizationqml2/declarativerendernode.cpp index 90e77e86..00e4caa5 100644 --- a/src/datavisualizationqml2/declarativerendernode.cpp +++ b/src/datavisualizationqml2/declarativerendernode.cpp @@ -90,7 +90,9 @@ void DeclarativeRenderNode::updateFBO() } QSGGeometry::updateTexturedRectGeometry(&m_geometry, - QRectF(0, 0, m_size.width(), m_size.height()), + QRectF(0, 0, + m_size.width() / m_controller->scene()->devicePixelRatio(), + m_size.height() / m_controller->scene()->devicePixelRatio()), QRectF(0, 1, 1, -1)); delete m_texture; |