Fix text renderer not respecting min/max mm scale for map units (fix #14698)

nyalldawson · nyalldawson · commit e3517c6f4ca7 · 2016-10-24T12:02:00.000+10:00
diff --git a/src/core/qgstextrenderer.cpp b/src/core/qgstextrenderer.cpp
@@ -1627,6 +1627,14 @@ double QgsTextRenderer::scaleToPixelContext( double size, const QgsRenderContext
       {
         size = size / mapUnitsPerPixel * ( rasterfactor ? c.rasterScaleFactor() : 1 );
       }
+      if ( unit == QgsUnitTypes::RenderMapUnits )
+      {
+        //check max/min size
+        if ( mapUnitScale.minSizeMMEnabled )
+          size = qMax( size, mapUnitScale.minSizeMM * c.scaleFactor() );
+        if ( mapUnitScale.maxSizeMMEnabled )
+          size = qMin( size, mapUnitScale.maxSizeMM * c.scaleFactor() );
+      }
       break;
 
     case QgsUnitTypes::RenderPixels:

Original file line number	Diff line number	Diff line change
`@@ -1627,6 +1627,14 @@ double QgsTextRenderer::scaleToPixelContext( double size, const QgsRenderContext`
`1627`	`1627`	`{`
`1628`	`1628`	`size = size / mapUnitsPerPixel * ( rasterfactor ? c.rasterScaleFactor() : 1 );`
`1629`	`1629`	`}`
	`1630`	`+ if ( unit == QgsUnitTypes::RenderMapUnits )`
	`1631`	`+ {`
	`1632`	`+ //check max/min size`
	`1633`	`+ if ( mapUnitScale.minSizeMMEnabled )`
	`1634`	`+ size = qMax( size, mapUnitScale.minSizeMM * c.scaleFactor() );`
	`1635`	`+ if ( mapUnitScale.maxSizeMMEnabled )`
	`1636`	`+ size = qMin( size, mapUnitScale.maxSizeMM * c.scaleFactor() );`
	`1637`	`+ }`
`1630`	`1638`	`break;`
`1631`	`1639`
`1632`	`1640`	`case QgsUnitTypes::RenderPixels:`