[labels] Fix word and letter spacing truncated to integers

nyalldawson · nyalldawson · commit 449fcad8ce08 · 2016-07-27T06:37:16.000+10:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3358,7 +3358,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();
@@ -3372,7 +3372,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
`@@ -3358,7 +3358,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,`
`3358`	`3358`	`wordspace = wspacing;`
`3359`	`3359`	`}`
`3360`	`3360`	`}`
`3361`		`- labelFont.setWordSpacing( sizeToPixel( wordspace, context, fontunits, false, fontSizeMapUnitScale ) );`
	`3361`	`+ labelFont.setWordSpacing( scaleToPixelContext( wordspace, context, fontunits, false, fontSizeMapUnitScale ) );`
`3362`	`3362`
`3363`	`3363`	`// data defined letter spacing?`
`3364`	`3364`	`double letterspace = labelFont.letterSpacing();`
`@@ -3372,7 +3372,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,`
`3372`	`3372`	`letterspace = lspacing;`
`3373`	`3373`	`}`
`3374`	`3374`	`}`
`3375`		`- labelFont.setLetterSpacing( QFont::AbsoluteSpacing, sizeToPixel( letterspace, context, fontunits, false, fontSizeMapUnitScale ) );`
	`3375`	`+ labelFont.setLetterSpacing( QFont::AbsoluteSpacing, scaleToPixelContext( letterspace, context, fontunits, false, fontSizeMapUnitScale ) );`
`3376`	`3376`
`3377`	`3377`	`// data defined font capitalization?`
`3378`	`3378`	`QFont::Capitalization fontcaps = labelFont.capitalization();`