[composer] Fix smart page breaks not being applied to html items when first calculating new frames

nyalldawson · nyalldawson · commit add7040a2f9b · 2014-05-08T20:43:23.000+10:00
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;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,15 @@ void QgsComposerMultiFrame::recalculateFrameSizes()`
`146`	`146`	`if ( mResizeMode == RepeatOnEveryPage )`
`147`	`147`	`{`
`148`	`148`	`newFrame->setContentSection( QRectF( 0, 0, newFrame->rect().width(), newFrame->rect().height() ) );`
	`149`	`+ currentY += frameHeight;`
`149`	`150`	`}`
`150`	`151`	`else`
`151`	`152`	`{`
`152`		`- newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), newFrame->rect().height() ) );`
	`153`	`+ double contentHeight = findNearbyPageBreak( currentY + newFrame->rect().height() ) - currentY;`
	`154`	`+ newFrame->setContentSection( QRectF( 0, currentY, newFrame->rect().width(), contentHeight ) );`
	`155`	`+ currentY += contentHeight;`
`153`	`156`	`}`
`154`		`- currentY += frameHeight;`
	`157`	`+`
`155`	`158`	`currentItem = newFrame;`
`156`	`159`	`}`
`157`	`160`	`}`