Fix #11330 (Composer legend can be smaller than its content)

qgis · Oct 21, 2014 · fe9c5c4 · fe9c5c4 · nyalldawson · Oct 21, 2014
1 parent 3546b32
commit fe9c5c4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -100,6 +100,14 @@ void QgsComposerLegend::paint( QPainter* painter, const QStyleOptionGraphicsItem
 
   QgsLegendRenderer legendRenderer( mLegendModel2, mSettings );
   legendRenderer.setLegendSize( rect().size() );
+
+  //adjust box if width or height is too small
+  QSizeF size = legendRenderer.minimumSize();
+  if ( size.height() > rect().height() )
+    setSceneRect( QRectF( pos().x(), pos().y(), rect().width(), size.height() ) );
+  if ( size.width() > rect().width() )
+    setSceneRect( QRectF( pos().x(), pos().y(), size.width(), rect().height() ) );
+
   legendRenderer.drawLegend( painter );
 
   painter->restore();
@@ -116,7 +124,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
 {
   QgsLegendRenderer legendRenderer( mLegendModel2, mSettings );
   QSizeF size = legendRenderer.minimumSize();
-  if ( !painter )
+  if ( painter )
     legendRenderer.drawLegend( painter );
   return size;
 }