Fix horizontally overlapping text in rect mode

qgis · Nov 24, 2022 · 12ec85a · 12ec85a
1 parent 4fd60d0
commit 12ec85a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/core/textrenderer/qgstextrenderer.cpp b/src/core/textrenderer/qgstextrenderer.cpp
@@ -1635,7 +1635,7 @@ void QgsTextRenderer::drawTextInternalHorizontal( QgsRenderContext &context, con
           textp.setBrush( textColor );
           textp.drawPath( path );
 
-          xOffset += metrics.fragmentHorizontalAdvance( blockIndex, fragmentIndex, mode );
+          xOffset += metrics.fragmentHorizontalAdvance( blockIndex, fragmentIndex, mode ) * fontScale;
           fragmentIndex ++;
         }
         textp.end();

diff --git a/tests/src/python/test_qgstextrenderer.py b/tests/src/python/test_qgstextrenderer.py
@@ -1470,8 +1470,9 @@ def imageCheck(self, name, reference_image, image):
         checker.setRenderedImage(file_name)
         checker.setColorTolerance(2)
         result = checker.compareImages(name, 20)
-        PyQgsTextRenderer.report += checker.report()
-        print(checker.report())
+        if checker.report():
+            PyQgsTextRenderer.report += checker.report()
+            print(checker.report())
         return result
 
     def checkRender(self, format, name, part=None, angle=0, alignment=QgsTextRenderer.AlignLeft,
@@ -1590,6 +1591,16 @@ def testDrawMassiveFont(self):
         format.setSize(1100)
         assert self.checkRender(format, 'massive_font', rect=QRectF(-800, -600, 1000, 1000), text=['a t'], image_size=800)
 
+    def testDrawRectMixedHtml(self):
+        """
+        Test drawing text in rect mode with cap height based line heights
+        """
+        format = QgsTextFormat()
+        format.setFont(getTestFont('bold'))
+        format.setAllowHtmlFormatting(True)
+        format.setSize(30)
+        assert self.checkRender(format, 'rect_html', rect=QRectF(100, 100, 100, 100), text=['first <span style="font-size:50pt">line</span>', 'second <span style="font-size:50pt">line</span>', 'third line'])
+
     def testDrawForcedItalic(self):
         """
         Test drawing with forced italic

diff --git a/tests/testdata/control_images/text_renderer/rect_html/rect_html.png b/tests/testdata/control_images/text_renderer/rect_html/rect_html.png