mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Finish 1.4.98

Browse Source
This commit is contained in:
Arin Alexander 2018-08-09 22:08:44 +03:00
commit a95d3ab09f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -112,7 +112,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 97 LIMEREPORT_VERSION_RELEASE = 98
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

1
limereport/bands/lrpagefooter.cpp
View File

@ -54,6 +54,7 @@ PageFooter::PageFooter(QObject *owner, QGraphicsItem *parent)
{ {
setBandTypeText( tr("Page Footer") ); setBandTypeText( tr("Page Footer") );
setMarkerColor(bandColor()); setMarkerColor(bandColor());
setAutoHeight(false);
} }
BaseDesignIntf *PageFooter::createSameTypeItem(QObject *owner, QGraphicsItem *parent) BaseDesignIntf *PageFooter::createSameTypeItem(QObject *owner, QGraphicsItem *parent)

2
limereport/lrreportrender.cpp
View File

@ -1255,7 +1255,7 @@ void ReportRender::startNewPage(bool isFirst)
renderPageHeader(m_patternPageItem); renderPageHeader(m_patternPageItem);
m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem); m_pageFooterHeight = calcPageFooterHeight(m_patternPageItem)+2;
m_maxHeightByColumn[m_currentColumn] -= m_pageFooterHeight; m_maxHeightByColumn[m_currentColumn] -= m_pageFooterHeight;
m_currentIndex=10; m_currentIndex=10;
m_dataAreaSize = m_maxHeightByColumn[m_currentColumn]; m_dataAreaSize = m_maxHeightByColumn[m_currentColumn];