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

)
qgis · Feb 14, 2017 · 3230e7bcbff7c07fe23adbe05fe965040c36d0d1 · 3230e7b
1 parent 852b1df
commit 3230e7bcbff7c07fe23adbe05fe965040c36d0d1
Unified Split

Showing with 7 additions and 1 deletion.

+7 −1 src/app/qgsdiagramproperties.cpp
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 )
   {