From d9a28e91104111937e4d91fe48690775edb019e8 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Thu, 9 Aug 2018 22:08:36 +0300 Subject: [PATCH] page footer placement changed --- common.pri | 2 +- limereport/bands/lrpagefooter.cpp | 1 + limereport/lrreportrender.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 8a9b289..779adad 100644 --- a/common.pri +++ b/common.pri @@ -70,7 +70,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 97 +LIMEREPORT_VERSION_RELEASE = 98 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/limereport/bands/lrpagefooter.cpp b/limereport/bands/lrpagefooter.cpp index c5be0fb..2b1c3b1 100644 --- a/limereport/bands/lrpagefooter.cpp +++ b/limereport/bands/lrpagefooter.cpp @@ -53,6 +53,7 @@ PageFooter::PageFooter(QObject *owner, QGraphicsItem *parent) { setBandTypeText( tr("Page Footer") ); setMarkerColor(bandColor()); + setAutoHeight(false); } BaseDesignIntf *PageFooter::createSameTypeItem(QObject *owner, QGraphicsItem *parent) diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index f8e20e8..84ce884 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -1137,7 +1137,7 @@ void ReportRender::startNewPage() renderPageHeader(m_patternPageItem); - m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem); + m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem)+2; m_maxHeightByColumn[m_currentColumn] -= m_pageFooterHeight; m_currentIndex=10; m_dataAreaSize = m_maxHeightByColumn[m_currentColumn];