[QGIS Commit] r15604 - trunk/qgis/src/core/composer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Mar 25 17:37:06 EDT 2011
Author: mhugent
Date: 2011-03-25 14:37:06 -0700 (Fri, 25 Mar 2011)
New Revision: 15604
Modified:
trunk/qgis/src/core/composer/qgscomposerlegend.cpp
Log:
Follow up for #3605
Modified: trunk/qgis/src/core/composer/qgscomposerlegend.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlegend.cpp 2011-03-25 21:31:33 UTC (rev 15603)
+++ trunk/qgis/src/core/composer/qgscomposerlegend.cpp 2011-03-25 21:37:06 UTC (rev 15604)
@@ -200,9 +200,9 @@
}
//Let the user omit the layer title item by having an empty layer title string
- currentYCoord += mLayerSpace;
if ( !layerItem->text().isEmpty() )
{
+ currentYCoord += mLayerSpace;
currentYCoord += fontAscentMillimeters( mLayerFont );
//draw layer Item
@@ -214,6 +214,12 @@
maxXCoord = qMax( maxXCoord, 2 * mBoxSpace + textWidthMillimeters( mLayerFont, layerItem->text() ) );
}
+ else //layer title omited
+ {
+ //symbol space will be added before the item later
+ currentYCoord += (mLayerSpace - mSymbolSpace);
+ }
+
//and child items
drawLayerChildItems( p, layerItem, currentYCoord, maxXCoord, opacity );
}
More information about the QGIS-commit
mailing list