Merge pull request #1540 from manisandro/composer_html_fixes

Recompute webpage viewport dimensions when resizing html frames
qgis · Sep 22, 2014 · d85f625 · d85f625
2 parents 86cbc2e + 788575e
commit d85f625
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/python/core/composer/qgscomposerhtml.sip b/python/core/composer/qgscomposerhtml.sip
@@ -188,6 +188,9 @@ class QgsComposerHtml: QgsComposerMultiFrame
      */
     void loadHtml();
 
+    /**Recalculates the frame sizes for the current viewport dimensions*/
+    void recalculateFrameSizes();
+
     void refreshExpressionContext();
 
     virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties );

diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -45,6 +45,8 @@ QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ):
 {
   mHtmlUnitsToMM = htmlUnitsToMM();
   mWebPage = new QWebPage();
+  mWebPage->mainFrame()->setScrollBarPolicy( Qt::Horizontal, Qt::ScrollBarAlwaysOff );
+  mWebPage->mainFrame()->setScrollBarPolicy( Qt::Vertical, Qt::ScrollBarAlwaysOff );
   mWebPage->setNetworkAccessManager( QgsNetworkAccessManager::instance() );
   QObject::connect( mWebPage, SIGNAL( loadFinished( bool ) ), this, SLOT( frameLoaded( bool ) ) );
   if ( mComposition )
@@ -187,6 +189,19 @@ void QgsComposerHtml::loadHtml()
     qApp->processEvents();
   }
 
+  recalculateFrameSizes();
+  //trigger a repaint
+  emit contentsChanged();
+}
+
+void QgsComposerHtml::frameLoaded( bool ok )
+{
+  Q_UNUSED( ok );
+  mLoaded = true;
+}
+
+void QgsComposerHtml::recalculateFrameSizes()
+{
   if ( frameCount() < 1 )  return;
 
   QSize contentsSize = mWebPage->mainFrame()->contentsSize();
@@ -202,23 +217,11 @@ void QgsComposerHtml::loadHtml()
   contentsSize.setWidth( maxFrameWidth * mHtmlUnitsToMM );
 
   mWebPage->setViewportSize( contentsSize );
-  mWebPage->mainFrame()->setScrollBarPolicy( Qt::Horizontal, Qt::ScrollBarAlwaysOff );
-  mWebPage->mainFrame()->setScrollBarPolicy( Qt::Vertical, Qt::ScrollBarAlwaysOff );
   mSize.setWidth( contentsSize.width() / mHtmlUnitsToMM );
   mSize.setHeight( contentsSize.height() / mHtmlUnitsToMM );
-
   renderCachedImage();
-
+  QgsComposerMultiFrame::recalculateFrameSizes();
-  recalculateFrameSizes();
   emit changed();
-  //trigger a repaint
-  emit contentsChanged();
-}
-
-void QgsComposerHtml::frameLoaded( bool ok )
-{
-  Q_UNUSED( ok );
-  mLoaded = true;
 }
 
 void QgsComposerHtml::renderCachedImage()

diff --git a/src/core/composer/qgscomposerhtml.h b/src/core/composer/qgscomposerhtml.h
@@ -211,6 +211,8 @@ class CORE_EXPORT QgsComposerHtml: public QgsComposerMultiFrame
      */
     void loadHtml();
 
+    /**Recalculates the frame sizes for the current viewport dimensions*/
+    void recalculateFrameSizes();
     void refreshExpressionContext();
 
     virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties );