From bc1a6606b39947c6d7934f19f2e13d1caf8fed1b Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Fri, 31 May 2019 20:49:50 +0300
Subject: [PATCH] Page render has been fixed

---
 common.pri                    | 2 +-
 limereport/lrreportrender.cpp | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common.pri b/common.pri
index 910d3a7..207b6b6 100644
--- a/common.pri
+++ b/common.pri
@@ -84,7 +84,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 4
-LIMEREPORT_VERSION_RELEASE = 132
+LIMEREPORT_VERSION_RELEASE = 134
 
 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
 DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"
diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index 01b024b..9c4d628 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -633,7 +633,7 @@ void ReportRender::renderPageFooter(PageItemDesignIntf *patternPage)
         BandDesignIntf* bandClone = dynamic_cast<BandDesignIntf*>(band->cloneItem(PreviewMode, m_renderPageItem, m_renderPageItem));
         replaceGroupsFunction(bandClone);
         bandClone->updateItemSize(m_datasources);
-        bandClone->setItemPos(m_patternPageItem->pageRect().x(),m_patternPageItem->pageRect().bottom()-bandClone->height());
+        bandClone->setItemPos(m_renderPageItem->pageRect().x(),m_renderPageItem->pageRect().bottom()-bandClone->height());
         bandClone->setHeight(m_pageFooterHeight);
         for(int i=0;i<m_maxHeightByColumn.size();++i)
             m_maxHeightByColumn[i]+=m_pageFooterHeight;
@@ -1116,14 +1116,13 @@ void ReportRender::startNewPage()
     initRenderPage();
 
     baseDesignIntfToScript(m_renderPageItem);
+    emit m_patternPageItem->beforeRender();
 
     m_renderPageItem->setObjectName(QLatin1String("ReportPage")+QString::number(m_pageCount));
     m_maxHeightByColumn[m_currentColumn]=m_renderPageItem->pageRect().height();
     m_currentStartDataPos[m_currentColumn]=m_patternPageItem->topMargin()*Const::mmFACTOR;
     m_currentIndex=0;
 
-    emit m_patternPageItem->beforeRender();
-
     renderPageHeader(m_patternPageItem);
 
     m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem)+2;