Fix for #7398, allow alpha value change in line pattern fill color picker

dakcarto · dakcarto · commit 1cecf8ee0861 · 2013-03-21T17:15:53.000-06:00
- Add alpha picker and render support for: line pattern fill, line decoration symbol, font marker symbol
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -937,7 +937,7 @@ QString QgsLineDecorationSymbolLayerV2::layerType() const
 void QgsLineDecorationSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )
 {
   QColor penColor = mColor;
-  penColor.setAlphaF( context.alpha() );
+  penColor.setAlphaF( mColor.alphaF() * context.alpha() );
 
   double width = mWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mWidthUnit );
   mPen.setWidth( context.outputLineWidth( width ) );
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -979,7 +979,7 @@ void QgsFontMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2R
 {
   QPainter* p = context.renderContext().painter();
   QColor penColor = context.selected() ? context.selectionColor() : mColor;
-  penColor.setAlphaF( context.alpha() );
+  penColor.setAlphaF( mColor.alphaF() * context.alpha() );
   p->setPen( penColor );
   p->setFont( mFont );
 
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -967,6 +967,7 @@ void QgsLineDecorationSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* lay
 
   // set values
   btnChangeColor->setColor( mLayer->color() );
+  btnChangeColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
   spinWidth->setValue( mLayer->width() );
 
   mWidthUnitComboBox->blockSignals( true );
@@ -1245,6 +1246,7 @@ void QgsLinePatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayerV2* laye
     mLineWidthSpinBox->setValue( mLayer->lineWidth() );
     mOffsetSpinBox->setValue( mLayer->offset() );
     mColorPushButton->setColor( mLayer->color() );
+    mColorPushButton->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
 
     //units
     mDistanceUnitComboBox->blockSignals( true );
@@ -1485,6 +1487,7 @@ void QgsFontMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
   cboFont->setCurrentFont( QFont( mLayer->fontFamily() ) );
   spinSize->setValue( mLayer->size() );
   btnColor->setColor( mLayer->color() );
+  btnColor->setColorDialogOptions( QColorDialog::ShowAlphaChannel );
   spinAngle->setValue( mLayer->angle() );
 
   //block

Original file line number	Diff line number	Diff line change
`@@ -937,7 +937,7 @@ QString QgsLineDecorationSymbolLayerV2::layerType() const`
`937`	`937`	`void QgsLineDecorationSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context )`
`938`	`938`	`{`
`939`	`939`	`QColor penColor = mColor;`
`940`		`- penColor.setAlphaF( context.alpha() );`
	`940`	`+ penColor.setAlphaF( mColor.alphaF() * context.alpha() );`
`941`	`941`
`942`	`942`	`double width = mWidth * QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mWidthUnit );`
`943`	`943`	`mPen.setWidth( context.outputLineWidth( width ) );`
Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ void QgsFontMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2R`
`979`	`979`	`{`
`980`	`980`	`QPainter* p = context.renderContext().painter();`
`981`	`981`	`QColor penColor = context.selected() ? context.selectionColor() : mColor;`
`982`		`- penColor.setAlphaF( context.alpha() );`
	`982`	`+ penColor.setAlphaF( mColor.alphaF() * context.alpha() );`
`983`	`983`	`p->setPen( penColor );`
`984`	`984`	`p->setFont( mFont );`
`985`	`985`