From f3ba4fcd80ea96205f919a5e2104eaa951fc794e Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 18 Jul 2018 19:48:05 +0300 Subject: [PATCH] Columns rendering has been fixed --- common.pri | 2 +- limereport/lrreportrender.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.pri b/common.pri index ab673b2..69b5256 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 = 91 +LIMEREPORT_VERSION_RELEASE = 92 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 ad98b90..5415356 100644 --- a/limereport/lrreportrender.cpp +++ b/limereport/lrreportrender.cpp @@ -948,6 +948,8 @@ bool ReportRender::registerBand(BandDesignIntf *band, bool registerInChildren) } + if (m_currentColumn == -1) m_currentColumn = 0; + if ( (isMultiColumnHeader(band) && band->height() <= m_maxHeightByColumn[0]) || (band->height() <= m_maxHeightByColumn[m_currentColumn])){