diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-03-20 15:41:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 18:48:49 +0200 |
| commit | aa2475b25d08d1c4575b879aa1d51ee91ed8b5c4 (patch) | |
| tree | a2fbc874578e74eee59c05b4a685a3a427003524 /src/quick/items/qquicktext.cpp | |
| parent | cedd342523e986028b8b4799cd564cd9307ebe12 (diff) | |
Use distance fields for text on retina displays
Change-Id: I6d3f3e7e4813155f2abb3edc51b145fb709c485b
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 917eaeadd8..9a90b408c3 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -312,6 +312,8 @@ qreal QQuickTextPrivate::getImplicitHeight() const not require advanced features such as transformation of the text. Using such features in combination with the NativeRendering render type will lend poor and sometimes pixelated results. + + On HighDpi "retina" displays this property is ignored and QtRendering is always used. */ QQuickText::RenderType QQuickText::renderType() const { @@ -2234,7 +2236,7 @@ QSGNode *QQuickText::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data node = static_cast<QQuickTextNode *>(oldNode); } - node->setUseNativeRenderer(d->renderType == NativeRendering); + node->setUseNativeRenderer(d->renderType == NativeRendering && d->window->devicePixelRatio() <= 1); node->deleteContent(); node->setMatrix(QMatrix4x4()); |