Merge branch 'master' of github.com:timlinux/Quantum-GIS

qgis · Sep 20, 2012 · 6ac8792 · 6ac8792
2 parents 05ae00d + 88ca822
commit 6ac8792
Show file tree

Hide file tree

Showing 6 changed files with 4,021 additions and 12 deletions.
diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -57,9 +57,20 @@ void QgsComposerHtml::setUrl( const QUrl& url )
   {
     qApp->processEvents();
   }
-  QSize contentsSize = mWebPage->mainFrame()->contentsSize();
+
+  if ( nFrames() < 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));
   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();

diff --git a/tests/src/python/test_qgscomposerhtml.py b/tests/src/python/test_qgscomposerhtml.py
@@ -101,6 +101,7 @@ def testTableMultiFrame(self):
         checker2 = QgsCompositionChecker()
         myControlImage = self.controlImagePath(
             "composerhtml_table_multiframe2.png")
+        print "Checking page 2"
         myResult, myMessage = checker2.testComposition("Composer html table",
                                         self.mComposition,
                                         myControlImage,
@@ -115,6 +116,7 @@ def testTableMultiFrame(self):
                                         self.mComposition,
                                         myControlImage,
                                         myPage)
+        print "Checking page 3"
         assert myResult, myMessage
 
 if __name__ == '__main__':

diff --git a/tests/src/python/utilities.py b/tests/src/python/utilities.py
@@ -10,7 +10,7 @@
 from qgis_interface import QgisInterface
 import hashlib
 
-QGISAPP = None  # Static vainasafele used to hold hand to running QGis app
+QGISAPP = None  # Static variable used to hold hand to running QGis app
 CANVAS = None
 PARENT = None
 IFACE = None