[QGIS Commit] r9641 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-11-15 11:21:40 -0500 (Sat, 15 Nov 2008)
New Revision: 9641

Modified:
   trunk/qgis/src/core/composer/qgscomposerlegend.cpp
Log:
Omit the layer title item completely if the string is empty

Modified: trunk/qgis/src/core/composer/qgscomposerlegend.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlegend.cpp	2008-11-15 14:13:19 UTC (rev 9640)
+++ trunk/qgis/src/core/composer/qgscomposerlegend.cpp	2008-11-15 16:21:40 UTC (rev 9641)
@@ -97,14 +97,18 @@
     currentLayerItem = rootItem->child( i );
     if ( currentLayerItem )
     {
-      currentYCoordinate += mLayerSpace;
-      currentYCoordinate += fontAscentMillimeters( mLayerFont );
+      //Let the user omit the layer title item by having an empty layer title string
+      if(!currentLayerItem->text().isEmpty())
+	{
+	  currentYCoordinate += mLayerSpace;
+	  currentYCoordinate += fontAscentMillimeters( mLayerFont );
 
-      //draw layer Item
-      if ( painter )
-      {
-        drawText( painter, mBoxSpace, currentYCoordinate, currentLayerItem->text(), mLayerFont );
-      }
+	  //draw layer Item
+	  if ( painter )
+	    {
+	      drawText( painter, mBoxSpace, currentYCoordinate, currentLayerItem->text(), mLayerFont );
+	    }
+	}
 
       maxXCoord = std::max( maxXCoord, 2 * mBoxSpace + textWidthMillimeters( mLayerFont, currentLayerItem->text() ) );