diff options
Diffstat (limited to 'src/runtime/q3dstextrenderer.cpp')
| -rw-r--r-- | src/runtime/q3dstextrenderer.cpp | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/runtime/q3dstextrenderer.cpp b/src/runtime/q3dstextrenderer.cpp index 443a50c..fba32ff 100644 --- a/src/runtime/q3dstextrenderer.cpp +++ b/src/runtime/q3dstextrenderer.cpp @@ -241,33 +241,6 @@ void Q3DSTextRenderer::renderText(QPainter *painter, Q3DSTextNode *text3DS) break; } - qreal shadowOffsetX = qreal(font->font.pixelSize() * text3DS->shadowOffsetX()) / 1000.; - qreal shadowOffsetY = qreal(font->font.pixelSize() * text3DS->shadowOffsetY()) / 1000.; - // To be removed in 2.x (when UIP version is next updated) - if (text3DS->shadow() && shadowOffsetX == 0. && shadowOffsetY == 0.) { - const qreal offset = qreal(text3DS->shadowOffset()) / 10.; - switch (text3DS->shadowHorizontalAlignment()) { - case Q3DSTextNode::Left: - shadowOffsetX = -offset; - break; - case Q3DSTextNode::Right: - shadowOffsetX = offset; - break; - case Q3DSTextNode::Center: - break; - } - switch (text3DS->shadowVerticalAlignment()) { - case Q3DSTextNode::Top: - shadowOffsetY = -offset; - break; - case Q3DSTextNode::Bottom: - shadowOffsetY = offset; - break; - case Q3DSTextNode::Middle: - break; - } - } - int wordWrapFlags = 0; if (dynamicTextArea) { wordWrapFlags = Qt::TextDontClip; @@ -302,6 +275,8 @@ void Q3DSTextRenderer::renderText(QPainter *painter, Q3DSTextNode *text3DS) QRectF bound(xTranslation, nextHeight, qreal(lineWidths.at(i)), lineHeight); QRectF actualBound; if (text3DS->shadow()) { + qreal shadowOffsetX = qreal(font->font.pixelSize() * text3DS->shadowOffsetX()) / 1000.; + qreal shadowOffsetY = qreal(font->font.pixelSize() * text3DS->shadowOffsetY()) / 1000.; QRectF boundShadow(xTranslation + shadowOffsetX, nextHeight + shadowOffsetY, qreal(lineWidths.at(i)), lineHeight); // shadow is a darker shade of the given font color |