qgis · Jul 6, 2016
diff --git a/‎src/core/qgslegendrenderer.cpp
Lines changed: 7 additions & 1 deletion b/‎src/core/qgslegendrenderer.cpp
Lines changed: 7 additions & 1 deletion
diff --git a/‎tests/testdata/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png
897 Bytes b/‎tests/testdata/control_images/legend/expected_legend_basic/expected_legend_basic_mask.png
897 Bytes
diff --git a/‎tests/testdata/control_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png
1.37 KB b/‎tests/testdata/control_images/legend/expected_legend_big_marker/expected_legend_big_marker_mask.png
1.37 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression.png
-2.13 KB b/‎tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression.png
-2.13 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png
-6.08 KB b/‎tests/testdata/control_images/legend/expected_legend_filter_by_expression/expected_legend_filter_by_expression_mask.png
-6.08 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map.png
-2.61 KB b/‎tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map.png
-2.61 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png
-5.24 KB b/‎tests/testdata/control_images/legend/expected_legend_filter_by_map/expected_legend_filter_by_map_mask.png
-5.24 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png
49 Bytes b/‎tests/testdata/control_images/legend/expected_legend_filter_by_map_dupe/expected_legend_filter_by_map_dupe_mask.png
49 Bytes
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon.png
-2.13 KB b/‎tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon.png
-2.13 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png
-5.46 KB b/‎tests/testdata/control_images/legend/expected_legend_filter_by_polygon/expected_legend_filter_by_polygon_mask.png
-5.46 KB
diff --git a/‎tests/testdata/control_images/legend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png
844 Bytes b/‎tests/testdata/control_images/legend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png
844 Bytes
diff --git a/‎tests/testdata/control_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png
506 Bytes b/‎tests/testdata/control_images/legend/expected_legend_mapunits/expected_legend_mapunits_mask.png
506 Bytes
diff --git a/‎tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png
35 Bytes b/‎tests/testdata/control_images/legend/expected_legend_raster_border/expected_legend_raster_border_mask.png
35 Bytes
diff --git a/‎tests/testdata/control_images/legend/expected_legend_three_columns/expected_legend_three_columns_mask.png
836 Bytes b/‎tests/testdata/control_images/legend/expected_legend_three_columns/expected_legend_three_columns_mask.png
836 Bytes
@@ -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 ) )
     {
Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,7 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr`
`161`	`161`
`162`	`162`	`// Group subitems`
`163`	`163`	`QList<Atom> groupAtoms = createAtomList( nodeGroup, splitLayer );`
	`164`	`+ bool hasSubItems = groupAtoms.size() > 0;`
`164`	`165`
`165`	`166`	`if ( nodeLegendStyle( nodeGroup ) != QgsComposerLegendStyle::Hidden )`
`166`	`167`	`{`
`@@ -188,7 +189,12 @@ QList<QgsLegendRenderer::Atom> QgsLegendRenderer::createAtomList( QgsLayerTreeGr`
`188`	`189`	`groupAtoms.append( atom );`
`189`	`190`	`}`
`190`	`191`	`}`
`191`		`- atoms.append( groupAtoms );`
	`192`	`+`
	`193`	`+ if ( hasSubItems ) //leave away groups without content`
	`194`	`+ {`
	`195`	`+ atoms.append( groupAtoms );`
	`196`	`+ }`
	`197`	`+`
`192`	`198`	`}`
`193`	`199`	`else if ( QgsLayerTree::isLayer( node ) )`
`194`	`200`	`{`