Legend: leave away empty groups (fix #12969)

(cherry-picked from c78347)
qgis · Jul 6, 2016 · 269db14 · 269db14
1 parent 586e14c
commit 269db14
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 1 deletion.
diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -161,6 +161,7 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr
 
       // Group subitems
       QList<Atom> groupAtoms = createAtomList( nodeGroup, splitLayer );
+      bool hasSubItems = groupAtoms.size() > 0;
 
       if ( nodeLegendStyle( nodeGroup ) != QgsComposerLegendStyle::Hidden )
       {
@@ -188,7 +189,12 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr
           groupAtoms.append( atom );
         }
       }
-      atoms.append( groupAtoms );
+
+      if ( hasSubItems ) //leave away groups without content
+      {
+        atoms.append( groupAtoms );
+      }
+
     }
     else if ( QgsLayerTree::isLayer( node ) )
     {

diff --git a/...data/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png b/...data/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png
diff --git a/...ol_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png b/...ol_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png
diff --git a/...d/expected_legend_filter_by_expression/expected_legend_filter_by_expression.png b/...d/expected_legend_filter_by_expression/expected_legend_filter_by_expression.png
diff --git a/...ected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png b/...ected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png
diff --git a/...l_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map.png b/...l_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map.png
diff --git a/...ges/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png b/...ges/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png
diff --git a/.../expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png b/.../expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png
diff --git a/.../legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon.png b/.../legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon.png
diff --git a/...nd/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png b/...nd/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png
diff --git a/...gend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png b/...gend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png
diff --git a/...ontrol_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png b/...ontrol_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png
diff --git a/...ges/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png b/...ges/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png
diff --git a/...ges/legend/expected_legend_three_columns/expected_legend_three_columns_mask.png b/...ges/legend/expected_legend_three_columns/expected_legend_three_columns_mask.png