Set the correct expression context for QgsHighlight

Fixes #17896
qgis · Feb 5, 2018 · 535de3b · 535de3b
1 parent 325af48
commit 535de3b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp
@@ -321,6 +321,8 @@ void QgsHighlight::paint( QPainter *p )
       return;
     QgsMapSettings mapSettings = mMapCanvas->mapSettings();
     QgsRenderContext context = QgsRenderContext::fromMapSettings( mapSettings );
+    context.expressionContext() << QgsExpressionContextUtils::layerScope( mLayer );
+
 
     // Because lower level outlines must be covered by upper level fill color
     // we render first with temporary opaque color, which is then replaced
@@ -341,6 +343,7 @@ void QgsHighlight::paint( QPainter *p )
       context.setPainter( &imagePainter );
 
       renderer->startRender( context, layer->fields() );
+      context.expressionContext().setFeature( mFeature );
       renderer->renderFeature( mFeature, context );
       renderer->stopRender( context );