Fix calculation of smart breaks when html has transparent background

Should finally fix troublesome composer html tests
qgis · Dec 2, 2014 · 0f76194 · 0f76194
1 parent 823d45a
commit 0f76194
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp
@@ -273,6 +273,7 @@ void QgsComposerHtml::renderCachedImage()
   {
     return;
   }
+  mRenderedPage->fill( Qt::transparent );
   QPainter painter;
   painter.begin( mRenderedPage );
   mWebPage->mainFrame()->render( &painter );

diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -214,7 +214,7 @@ void TestQgsComposerHtml::htmlMultiFrameSmartBreak()
 
   //page2
   QgsCompositionChecker checker2( "composerhtml_smartbreaks2", mComposition );
-  result = checker2.testComposition( mReport, 1, 3000 ) && result;
+  result = checker2.testComposition( mReport, 1, 200 ) && result;
 
   mComposition->removeMultiFrame( htmlItem );
   delete htmlItem;

diff --git a/tests/src/python/test_qgscomposerhtml.py b/tests/src/python/test_qgscomposerhtml.py
@@ -119,7 +119,7 @@ def testHtmlSmartBreaks(self):
         print "Checking page 2"
         myPage = 1
         checker2 = QgsCompositionChecker('composerhtml_smartbreaks2', self.mComposition)
-        myTestResult, myMessage = checker2.testComposition( myPage, 3000 )
+        myTestResult, myMessage = checker2.testComposition( myPage, 200 )
         assert myTestResult, myMessage
 
         self.mComposition.removeMultiFrame( composerHtml )

diff --git a/...mages/expected_composerhtml_smartbreaks2/expected_composerhtml_smartbreaks2.png b/...mages/expected_composerhtml_smartbreaks2/expected_composerhtml_smartbreaks2.png