mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2025-03-13 22:03:54 +03:00
Finish 1.4.93
This commit is contained in:
commit
be36aefb87
@ -105,7 +105,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
|
||||
|
||||
LIMEREPORT_VERSION_MAJOR = 1
|
||||
LIMEREPORT_VERSION_MINOR = 4
|
||||
LIMEREPORT_VERSION_RELEASE = 92
|
||||
LIMEREPORT_VERSION_RELEASE = 93
|
||||
|
||||
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
|
||||
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
|
||||
|
@ -1009,7 +1009,6 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
|
||||
m_currentColumn = -1;
|
||||
}
|
||||
|
||||
|
||||
if ( (band->columnsCount() > 1) &&
|
||||
(!band->isHeader() || (band->bandNestingLevel() > 0 && band->columnsFillDirection() != BandDesignIntf::Horizontal ))){
|
||||
|
||||
@ -1019,14 +1018,17 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren)
|
||||
else
|
||||
m_currentColumn = 0;
|
||||
} else {
|
||||
if ( (m_maxHeightByColumn[0] == m_maxHeightByColumn[m_currentColumn]) && (m_maxHeightByColumn[0] >= band->height()) ){
|
||||
m_currentColumn = m_currentColumn == -1 ? 0: m_currentColumn;
|
||||
if ((m_currentColumn !=0) &&
|
||||
(m_maxHeightByColumn[0] == m_maxHeightByColumn[m_currentColumn]) &&
|
||||
(m_maxHeightByColumn[0] >= band->height())
|
||||
){
|
||||
m_currentColumn = 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (m_currentColumn == -1) m_currentColumn = 0;
|
||||
m_currentColumn = m_currentColumn == -1 ? 0: m_currentColumn;
|
||||
|
||||
if ( (band->height() <= m_maxHeightByColumn[m_currentColumn]) ||
|
||||
m_patternPageItem->endlessHeight() ||
|
||||
|
Loading…
Reference in New Issue
Block a user