Fix diagram legend symbol selector missing associated layer (refs #16164)

nyalldawson · nyalldawson · commit 3230e7bcbff7 · 2017-02-14T14:29:49.000+10:00
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -939,7 +939,13 @@ void QgsDiagramProperties::on_mPlacementComboBox_currentIndexChanged( int index
 void QgsDiagramProperties::on_mButtonSizeLegendSymbol_clicked()
 {
   QgsMarkerSymbol* newSymbol = mSizeLegendSymbol->clone();
-  QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this );
+  QgsSymbolWidgetContext context;
+  context.setMapCanvas( mMapCanvas );
+  QgsExpressionContext ec = createExpressionContext();
+  context.setExpressionContext( &ec );
+
+  QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), mLayer, this );
+  d.setContext( context );
 
   if ( d.exec() == QDialog::Accepted )
   {

Original file line number	Diff line number	Diff line change
`@@ -939,7 +939,13 @@ void QgsDiagramProperties::on_mPlacementComboBox_currentIndexChanged( int index`
`939`	`939`	`void QgsDiagramProperties::on_mButtonSizeLegendSymbol_clicked()`
`940`	`940`	`{`
`941`	`941`	`QgsMarkerSymbol* newSymbol = mSizeLegendSymbol->clone();`
`942`		`- QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this );`
	`942`	`+ QgsSymbolWidgetContext context;`
	`943`	`+ context.setMapCanvas( mMapCanvas );`
	`944`	`+ QgsExpressionContext ec = createExpressionContext();`
	`945`	`+ context.setExpressionContext( &ec );`
	`946`	`+`
	`947`	`+ QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), mLayer, this );`
	`948`	`+ d.setContext( context );`
`943`	`949`
`944`	`950`	`if ( d.exec() == QDialog::Accepted )`
`945`	`951`	`{`