From 890ec775af9bd3493db72b10db0e078d437f676c Mon Sep 17 00:00:00 2001 From: Marco Hugentobler Date: Thu, 4 Oct 2012 19:32:19 +0200 Subject: [PATCH] Change height calculation in composer html --- src/core/composer/qgscomposerhtml.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp index 29183d05c22..282c941fbb7 100644 --- a/src/core/composer/qgscomposerhtml.cpp +++ b/src/core/composer/qgscomposerhtml.cpp @@ -59,18 +59,12 @@ void QgsComposerHtml::setUrl( const QUrl& url ) } if ( frameCount() < 1 ) return; - //QSize contentsSize = mWebPage->mainFrame()->contentsSize(); - QRectF contentRect = this->mFrameItems.at( 0 )->boundingRect(); - //there is going to be a little rounding error converting from float to int - QSize contentsSize = QSize(( int )( contentRect.width() * mHtmlUnitsToMM ), - ( int )( contentRect.height() * mHtmlUnitsToMM ) ); + QSize contentsSize = mWebPage->mainFrame()->contentsSize(); + contentsSize.setWidth( mFrameItems.at( 0 )->boundingRect().width() * mHtmlUnitsToMM ); mWebPage->setViewportSize( contentsSize ); - - //suppress scroll bars always mWebPage->mainFrame()->setScrollBarPolicy( Qt::Horizontal, Qt::ScrollBarAlwaysOff ); mWebPage->mainFrame()->setScrollBarPolicy( Qt::Vertical, Qt::ScrollBarAlwaysOff ); - mSize.setWidth( contentsSize.width() / mHtmlUnitsToMM ); mSize.setHeight( contentsSize.height() / mHtmlUnitsToMM ); recalculateFrameSizes();