[composer] Respect linked layer visibility when drawing annotation it…

…ems (fix #10172)
qgis · Jan 30, 2017 · 2293973 · 2293973
1 parent 4058f47
commit 2293973
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -1879,12 +1879,17 @@ void QgsComposerMap::drawAnnotations( QPainter* painter )
   QgsRenderContext rc = QgsComposerUtils::createRenderContextForMap( this, painter );
   rc.setForceVectorOutput( true );
   rc.setExpressionContext( createExpressionContext() );
+  QList< QgsMapLayer* > layers = layersToRender( &rc.expressionContext() );
+
   Q_FOREACH ( QgsAnnotation* annotation, annotations )
   {
-    if ( !annotation )
+    if ( !annotation || !annotation->isVisible() )
     {
       continue;
     }
+    if ( annotation->mapLayer() && !layers.contains( annotation->mapLayer() ) )
+      continue;
+
     drawAnnotation( annotation, rc );
   }
 }