Scaled font also needs to scale letter/word spacing

qgis · Jul 10, 2020 · b449361 · b449361
1 parent 58e31fd
commit b449361
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core/textrenderer/qgstextformat.cpp b/src/core/textrenderer/qgstextformat.cpp
@@ -77,9 +77,11 @@ QFont QgsTextFormat::scaledFont( const QgsRenderContext &context, double scaleFa
   {
     double fontPixelSize = context.convertToPainterUnits( d->fontSize, d->fontSizeUnits, d->fontSizeMapUnitScale );
     font.setPixelSize( std::round( scaleFactor * fontPixelSize + 0.5 ) );
-    font.setLetterSpacing( QFont::AbsoluteSpacing, d->textFont.letterSpacing() * scaleFactor );
-    font.setWordSpacing( d->textFont.wordSpacing() * scaleFactor );
   }
+
+  font.setLetterSpacing( QFont::AbsoluteSpacing, context.convertToPainterUnits( d->textFont.letterSpacing(), d->fontSizeUnits, d->fontSizeMapUnitScale ) * scaleFactor );
+  font.setWordSpacing( context.convertToPainterUnits( d->textFont.wordSpacing(), d->fontSizeUnits, d->fontSizeMapUnitScale ) * scaleFactor  * scaleFactor );
+
   return font;
 }