From e85e0cbb085264d0ad4c4e65e7c72e55574f43d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 2 Oct 2013 13:31:11 +0300 Subject: Fix for text clipping Task-number: QTRD-2314 Change-Id: Iccc54db3f214a10b97a55138368c9b3282b477b4 Change-Id: Iccc54db3f214a10b97a55138368c9b3282b477b4 Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/utils.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 738f4775..629f525f 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -48,8 +48,8 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo const QColor &txtColor, QDataVis::LabelStyle style, bool borders, int maxLabelWidth) { - GLuint paddingWidth = 15; - GLuint paddingHeight = 15; + GLuint paddingWidth = 20; + GLuint paddingHeight = 20; // Calculate text dimensions QFont valueFont = font; valueFont.setPointSize(textureFontSize); @@ -58,6 +58,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo if (maxLabelWidth && QDataVis::LabelStyleTransparent != style) valueStrWidth = maxLabelWidth; int valueStrHeight = valueFM.height(); + valueStrWidth += paddingWidth / 2; // Fix clipping problem with skewed fonts (italic or italic-style) QSize labelSize; #if defined(Q_OS_ANDROID) @@ -66,7 +67,7 @@ QImage Utils::printTextToImage(const QFont &font, const QString &text, const QCo GLuint prePadding = 5; // Android needs to use this always (when given) because of the power of 2 -issue. if (maxLabelWidth) - valueStrWidth = maxLabelWidth; + valueStrWidth = maxLabelWidth + paddingWidth / 2; labelSize = QSize(valueStrWidth + prePadding, valueStrHeight + prePadding); //qDebug() << "label size before padding" << text << labelSize; labelSize.setWidth(getNearestPowerOfTwo(labelSize.width(), paddingWidth)); -- cgit v1.2.3