diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-23 13:12:50 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-23 13:28:57 +0300 |
| commit | 5261fd6733ab7080989112e08057632dd76f22b3 (patch) | |
| tree | 242153eac6a4ff415e103051c043f5a0aa258849 /src/datavisualization/utils/utils.cpp | |
| parent | 9f8f25a8b526d636fccf70c9f782b714da865983 (diff) | |
Label "skewing" fixed
Task-number: QTRD-2322
Change-Id: Ie4bb95dc4f62bad1fef605461452168ea260fa26
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/utils/utils.cpp')
| -rw-r--r-- | src/datavisualization/utils/utils.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index eaefad97..4cda5fad 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -52,7 +52,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo GLuint paddingHeight = 15; // Calculate text dimensions QFont valueFont = font; - valueFont.setPointSize(50); + valueFont.setPointSize(textureFontSize); QFontMetrics valueFM(valueFont); int valueStrWidth = valueFM.width(text); if (maxLabelWidth && QDataVis::TransparencyNoBackground != transparency) @@ -88,9 +88,9 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo // Paint text painter.setRenderHint(QPainter::Antialiasing, true); painter.setCompositionMode(QPainter::CompositionMode_Source); + painter.setFont(valueFont); switch (transparency) { case QDataVis::TransparencyNoBackground: { - painter.setFont(valueFont); painter.setPen(txtColor); #if defined(Q_OS_ANDROID) painter.drawText((labelSize.width() - valueStrWidth) / 2.0f, @@ -108,12 +108,14 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo } case QDataVis::TransparencyFromTheme: { painter.setBrush(QBrush(bgrColor)); - if (borders) + if (borders) { painter.setPen(QPen(QBrush(txtColor), 5, Qt::SolidLine, Qt::SquareCap, Qt::RoundJoin)); - else + painter.drawRoundedRect(5, 5, labelSize.width() - 10, labelSize.height() - 10, + 10.0, 10.0); + } else { painter.setPen(bgrColor); - painter.drawRoundedRect(0, 0, labelSize.width(), labelSize.height(), 10.0, 10.0f); - painter.setFont(valueFont); + painter.drawRoundedRect(0, 0, labelSize.width(), labelSize.height(), 10.0, 10.0); + } painter.setPen(txtColor); painter.drawText((labelSize.width() - valueStrWidth) / 2.0f, (labelSize.height() - valueStrHeight) / 2.0f, @@ -123,13 +125,16 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo break; } case QDataVis::TransparencyNone: { - painter.setBrush(QBrush(bgrColor)); - if (borders) - painter.setPen(QPen(QBrush(txtColor), 7.5)); - else - painter.setPen(bgrColor); - painter.drawRect(0, 0, labelSize.width(), labelSize.height()); - painter.setFont(valueFont); + QColor labelColor = QColor(bgrColor); + labelColor.setAlphaF(1.0); + painter.setBrush(QBrush(labelColor)); + if (borders) { + painter.setPen(QPen(QBrush(txtColor), 7.5, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin)); + painter.drawRect(7.5, 7.5, labelSize.width() - 15, labelSize.height() - 15); + } else { + painter.setPen(labelColor); + painter.drawRect(0, 0, labelSize.width(), labelSize.height()); + } painter.setPen(txtColor); painter.drawText((labelSize.width() - valueStrWidth) / 2.0f, (labelSize.height() - valueStrHeight) / 2.0f, |