Do not show in composer legend unused layers if filtering by map is e…

…nabled This resolves #11457 and partially #11293
qgis · Oct 24, 2014 · 4ac94f2 · 4ac94f2
1 parent 6bde8a2
commit 4ac94f2
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -208,6 +208,12 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr
 
       QList<QgsLayerTreeModelLegendNode*> legendNodes = mLegendModel->layerLegendNodes( nodeLayer );
 
+      // workaround for the issue that "filtering by map" does not remove layer nodes that have no symbols present
+      // on the map. We explicitly skip such layers here. In future ideally that should be handled directly
+      // in the layer tree model
+      if ( legendNodes.isEmpty() && mLegendModel->legendFilterByMap() )
+        continue;
+
       QList<Atom> layerAtoms;
 
       for ( int j = 0; j < legendNodes.count(); j++ )