diff --git a/common.pri b/common.pri index 69b5256..5b0e9d1 100644 --- a/common.pri +++ b/common.pri @@ -62,7 +62,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}\" diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp index 5415356..28e9882 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -931,7 +931,6 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren) m_currentColumn = -1; } - if ( (band->columnsCount() > 1) && (!band->isHeader() || (band->bandNestingLevel() > 0 && band->columnsFillDirection() != BandDesignIntf::Horizontal ))){ @@ -941,14 +940,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 ( (isMultiColumnHeader(band) && band->height() <= m_maxHeightByColumn[0]) || (band->height() <= m_maxHeightByColumn[m_currentColumn])){