summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-05-31 11:23:58 +0200
committerAndy Nichols <andy.nichols@qt.io>2018-05-31 09:31:42 +0000
commit3fd9cacf0ad1887a231c42522374797ab371566d (patch)
tree809b6ebd46895a155c443b769d9ffd73d82ef2fa
parent42b0fb3eda842f35efc2c75827c872b71eb839bb (diff)
Remove two unnecessary (and problematic) dpr multiplications
Change-Id: I08681157d34f0c9f7816cc3f41a6764017d08565 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--src/runtime/q3dsscenemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/q3dsscenemanager.cpp b/src/runtime/q3dsscenemanager.cpp
index e280809..5e113a2 100644
--- a/src/runtime/q3dsscenemanager.cpp
+++ b/src/runtime/q3dsscenemanager.cpp
@@ -3951,7 +3951,7 @@ Qt3DCore::QEntity *Q3DSSceneManager::buildText(Q3DSTextNode *text3DS, Q3DSLayerN
std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
text3DS->addEventHandler(QString(), std::bind(&Q3DSSceneManager::handleEvent, this, std::placeholders::_1));
- QSize sz = m_textRenderer->textImageSize(text3DS) * m_viewportData.viewportDpr;
+ QSize sz = m_textRenderer->textImageSize(text3DS);
if (sz.isEmpty())
return entity;
@@ -4002,7 +4002,7 @@ void Q3DSSceneManager::updateText(Q3DSTextNode *text3DS, bool needsNewImage)
if (needsNewImage) {
// textstring, leading, tracking
- const QSize sz = m_textRenderer->textImageSize(text3DS) * m_viewportData.viewportDpr;
+ const QSize sz = m_textRenderer->textImageSize(text3DS);
if (!sz.isEmpty()) {
data->mesh->setWidth(sz.width());
data->mesh->setHeight(sz.height());