[composer] Fix smart page breaks not being applied to html items when…

… first calculating new frames
qgis · May 8, 2014 · add7040 · add7040
1 parent 0d38387
commit add7040
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp
@@ -146,12 +146,15 @@ void QgsComposerMultiFrame::recalculateFrameSizes()
       if ( mResizeMode == RepeatOnEveryPage )
       {
         newFrame->setContentSection( QRectF( 0, 0, newFrame->rect().width(), newFrame->rect().height() ) );
+        currentY += frameHeight;
       }
       else
       {
-        newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), newFrame->rect().height() ) );
+        double contentHeight = findNearbyPageBreak( currentY + newFrame->rect().height() ) - currentY;
+        newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), contentHeight ) );
+        currentY += contentHeight;
       }
-      currentY += frameHeight;
+
       currentItem = newFrame;
     }
   }