[QGIS Commit] r13409 - trunk/qgis/src/core/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-04-29 17:55:16 -0400 (Thu, 29 Apr 2010)
New Revision: 13409

Modified:
   trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
Log:
Fixed resizing of font marker when units are map units.


Modified: trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-04-29 19:47:31 UTC (rev 13408)
+++ trunk/qgis/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp	2010-04-29 21:55:16 UTC (rev 13409)
@@ -655,7 +655,9 @@
 
 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 );