[labels] Fix word and letter spacing truncated to integers

nyalldawson · nyalldawson · commit ae211b423a58 · 2016-07-30T09:29:48.000+10:00
(cherry-picked from 449fcad)
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3362,7 +3362,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,
       wordspace = wspacing;
     }
   }
-  labelFont.setWordSpacing( sizeToPixel( wordspace, context, fontunits, false, fontSizeMapUnitScale ) );
+  labelFont.setWordSpacing( scaleToPixelContext( wordspace, context, fontunits, false, fontSizeMapUnitScale ) );
 
   // data defined letter spacing?
   double letterspace = labelFont.letterSpacing();
@@ -3376,7 +3376,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,
       letterspace = lspacing;
     }
   }
-  labelFont.setLetterSpacing( QFont::AbsoluteSpacing, sizeToPixel( letterspace, context, fontunits, false, fontSizeMapUnitScale ) );
+  labelFont.setLetterSpacing( QFont::AbsoluteSpacing, scaleToPixelContext( letterspace, context, fontunits, false, fontSizeMapUnitScale ) );
 
   // data defined font capitalization?
   QFont::Capitalization fontcaps = labelFont.capitalization();

Original file line number	Diff line number	Diff line change
`@@ -3362,7 +3362,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,`
`3362`	`3362`	`wordspace = wspacing;`
`3363`	`3363`	`}`
`3364`	`3364`	`}`
`3365`		`- labelFont.setWordSpacing( sizeToPixel( wordspace, context, fontunits, false, fontSizeMapUnitScale ) );`
	`3365`	`+ labelFont.setWordSpacing( scaleToPixelContext( wordspace, context, fontunits, false, fontSizeMapUnitScale ) );`
`3366`	`3366`
`3367`	`3367`	`// data defined letter spacing?`
`3368`	`3368`	`double letterspace = labelFont.letterSpacing();`
`@@ -3376,7 +3376,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,`
`3376`	`3376`	`letterspace = lspacing;`
`3377`	`3377`	`}`
`3378`	`3378`	`}`
`3379`		`- labelFont.setLetterSpacing( QFont::AbsoluteSpacing, sizeToPixel( letterspace, context, fontunits, false, fontSizeMapUnitScale ) );`
	`3379`	`+ labelFont.setLetterSpacing( QFont::AbsoluteSpacing, scaleToPixelContext( letterspace, context, fontunits, false, fontSizeMapUnitScale ) );`
`3380`	`3380`
`3381`	`3381`	`// data defined font capitalization?`
`3382`	`3382`	`QFont::Capitalization fontcaps = labelFont.capitalization();`