summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-06-06 16:20:47 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-06-11 04:50:28 +0000
commit26d3b64ac721c8fb87dcb2da91bd63bb571006ed (patch)
tree3d46a5895253986e7c5dc19bd320f8969d24a0de
parent6abed231ae3677e25406d63cc1ad279614acdf3d (diff)
Add devicePixelRatio to QPaintedTextureImagePrivate
Cannot add new APIs in a patch release so add it only to the already exported private class. Task-number: QTBUG-68718 Change-Id: I01b0ceb4ad1a5a7f27c7335a91a25cd39e9a28cd Reviewed-by: Christian Stromme <christian.stromme@qt.io>
-rw-r--r--src/render/texture/qpaintedtextureimage.cpp8
-rw-r--r--src/render/texture/qpaintedtextureimage_p.h1
2 files changed, 8 insertions, 1 deletions
diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp
index 8d2dd1436..6e220f340 100644
--- a/src/render/texture/qpaintedtextureimage.cpp
+++ b/src/render/texture/qpaintedtextureimage.cpp
@@ -69,6 +69,7 @@ namespace Qt3DRender {
QPaintedTextureImagePrivate::QPaintedTextureImagePrivate()
: m_imageSize(256,256)
+ , m_devicePixelRatio(1.0)
, m_generation(0)
{
}
@@ -80,8 +81,13 @@ QPaintedTextureImagePrivate::~QPaintedTextureImagePrivate()
void QPaintedTextureImagePrivate::repaint()
{
// create or re-allocate QImage with current size
- if (m_image.isNull() || (m_image->size() != m_imageSize))
+ if (m_image.isNull()
+ || m_image->size() != m_imageSize
+ || m_image->devicePixelRatio() != m_devicePixelRatio)
+ {
m_image.reset(new QImage(m_imageSize, QImage::Format_RGBA8888));
+ m_image->setDevicePixelRatio(m_devicePixelRatio);
+ }
QPainter painter(m_image.data());
q_func()->paint(&painter);
diff --git a/src/render/texture/qpaintedtextureimage_p.h b/src/render/texture/qpaintedtextureimage_p.h
index 93705d96e..4e554f1c1 100644
--- a/src/render/texture/qpaintedtextureimage_p.h
+++ b/src/render/texture/qpaintedtextureimage_p.h
@@ -72,6 +72,7 @@ public:
Q_DECLARE_PUBLIC(QPaintedTextureImage)
QSize m_imageSize;
+ qreal m_devicePixelRatio;
QScopedPointer<QImage> m_image;
QTextureImageDataGeneratorPtr m_currentGenerator;