Fixed resizing of font marker when units are map units.

wonder · wonder · commit 31f4b74c8d3d · 2010-04-29T21:55:16.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13409 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -655,7 +655,9 @@ QString QgsFontMarkerSymbolLayerV2::layerType() const
 
 void QgsFontMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
-  mFont = QFont( mFontFamily, MM2POINT( mSize ) / context.renderContext().rasterScaleFactor() );
+  double pixelSize = context.outputPixelSize( mSize );
+  mFont = QFont( mFontFamily );
+  mFont.setPixelSize( pixelSize / context.renderContext().rasterScaleFactor() );
   QFontMetrics fm( mFont );
   mChrOffset = QPointF( fm.width( mChr ) / 2, -fm.ascent() / 2 );
 

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,9 @@ QString QgsFontMarkerSymbolLayerV2::layerType() const`
`655`	`655`
`656`	`656`	`void QgsFontMarkerSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )`
`657`	`657`	`{`
`658`		`- mFont = QFont( mFontFamily, MM2POINT( mSize ) / context.renderContext().rasterScaleFactor() );`
	`658`	`+ double pixelSize = context.outputPixelSize( mSize );`
	`659`	`+ mFont = QFont( mFontFamily );`
	`660`	`+ mFont.setPixelSize( pixelSize / context.renderContext().rasterScaleFactor() );`
`659`	`661`	`QFontMetrics fm( mFont );`
`660`	`662`	`mChrOffset = QPointF( fm.width( mChr ) / 2, -fm.ascent() / 2 );`
`661`	`663`