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

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex 2016-08-02 20:33:11 +03:00
commit 30c1a954f3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
limereport/lrreportrender.cpp
View File

@ -365,8 +365,9 @@ void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRen
if (percent<bandClone->maxScalePercent()){ if (percent<bandClone->maxScalePercent()){
percent += 2; percent += 2;
bandClone->setScale((100-percent)/100); bandClone->setScale((100-percent)/100);
bandClone->setHeight(m_maxHeightByColumn[m_currentColumn]); BandDesignIntf* upperPart = dynamic_cast<BandDesignIntf*>(bandClone->cloneUpperPart(m_maxHeightByColumn[m_currentColumn]));
registerBand(bandClone); registerBand(upperPart);
delete bandClone;
} }
} else { } else {
@ -381,8 +382,9 @@ void ReportRender::renderBand(BandDesignIntf *patternBand, ReportRender::DataRen
startNewPage(); startNewPage();
} }
if (!registerBand(bandClone)) { if (!registerBand(bandClone)) {
bandClone->setHeight(m_maxHeightByColumn[m_currentColumn]); BandDesignIntf* upperPart = dynamic_cast<BandDesignIntf*>(bandClone->cloneUpperPart(m_maxHeightByColumn[m_currentColumn]));
registerBand(bandClone); registerBand(upperPart);
delete bandClone;
}; };
} else { } else {
bandClone->setHeight(m_maxHeightByColumn[m_currentColumn]); bandClone->setHeight(m_maxHeightByColumn[m_currentColumn]);