From d180cb47b147ca07874b7defe1ed2771d5cb73fc Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Fri, 19 Nov 2021 07:32:05 +0100 Subject: Fix boundsOnElement() for text nodes having transformations Text layout calculations are done with a local scaling, and that was mixed up with the node transformation when computing the bounds. Fixes: QTBUG-98139 Pick-to: 6.2 Change-Id: Id3ab0500cfba4578989b5766677a53340e8cecde Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/svg/qsvggraphics.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/svg/qsvggraphics.cpp b/src/svg/qsvggraphics.cpp index bc4f9d6..764c21e 100644 --- a/src/svg/qsvggraphics.cpp +++ b/src/svg/qsvggraphics.cpp @@ -289,7 +289,7 @@ QRectF QSvgText::bounds(QPainter *p, QSvgExtraStates &states) const { QRectF boundingRect; draw_helper(p, states, &boundingRect); - return boundingRect; + return p->transform().mapRect(boundingRect); } void QSvgText::draw(QPainter *p, QSvgExtraStates &states) @@ -465,7 +465,7 @@ void QSvgText::draw_helper(QPainter *p, QSvgExtraStates &states, QRectF *boundin brect.translate(m_coord * scale); if (bounds.height() > 0) brect.setBottom(qMin(brect.bottom(), bounds.bottom())); - *boundingRect = p->transform().mapRect(brect); + *boundingRect = QTransform::fromScale(1 / scale, 1 / scale).mapRect(brect); } } -- cgit v1.2.1