Fix transparency for data defined color in ellipse marker

mhugent · mhugent · commit bc6c940339a3 · 2018-06-19T16:23:26.000+02:00
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -246,7 +246,7 @@ void QgsEllipseSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderConte
       QColor fillColor = QgsSymbolLayerV2Utils::decodeColor( colorString );
       if ( context.alpha() < 1.0 )
       {
-        fillColor.setAlpha( fillColor.alphaF() * context.alpha() );
+        fillColor.setAlphaF( fillColor.alphaF() * context.alpha() );
       }
       mBrush.setColor( fillColor );
     }
@@ -260,7 +260,7 @@ void QgsEllipseSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderConte
       QColor outlineColor = QgsSymbolLayerV2Utils::decodeColor( colorString );
       if ( context.alpha() < 1.0 )
       {
-        outlineColor.setAlpha( outlineColor.alphaF() * context.alpha() );
+        outlineColor.setAlphaF( outlineColor.alphaF() * context.alpha() );
       }
       mPen.setColor( outlineColor );
     }

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ void QgsEllipseSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderConte`
`246`	`246`	`QColor fillColor = QgsSymbolLayerV2Utils::decodeColor( colorString );`
`247`	`247`	`if ( context.alpha() < 1.0 )`
`248`	`248`	`{`
`249`		`- fillColor.setAlpha( fillColor.alphaF() * context.alpha() );`
	`249`	`+ fillColor.setAlphaF( fillColor.alphaF() * context.alpha() );`
`250`	`250`	`}`
`251`	`251`	`mBrush.setColor( fillColor );`
`252`	`252`	`}`
`@@ -260,7 +260,7 @@ void QgsEllipseSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderConte`
`260`	`260`	`QColor outlineColor = QgsSymbolLayerV2Utils::decodeColor( colorString );`
`261`	`261`	`if ( context.alpha() < 1.0 )`
`262`	`262`	`{`
`263`		`- outlineColor.setAlpha( outlineColor.alphaF() * context.alpha() );`
	`263`	`+ outlineColor.setAlphaF( outlineColor.alphaF() * context.alpha() );`
`264`	`264`	`}`
`265`	`265`	`mPen.setColor( outlineColor );`
`266`	`266`	`}`