From 8d6cf97a4813dc3c6b198efa63e7828584836fd0 Mon Sep 17 00:00:00 2001
From: wartime <tang4231@163.com>
Date: Sun, 15 Dec 2019 14:23:27 +0800
Subject: [PATCH 1/2] Increase line number for every group header

---
 limereport/lrreportrender.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/limereport/lrreportrender.cpp b/limereport/lrreportrender.cpp
index c17973d..f0a4c5a 100644
--- a/limereport/lrreportrender.cpp
+++ b/limereport/lrreportrender.cpp
@@ -1,4 +1,4 @@
-/***************************************************************************
+/***************************************************************************
  *   This file is part of the Lime Report project                          *
  *   Copyright (C) 2015 by Alexander Arin                                  *
  *   arin_a@bk.ru                                                          *
@@ -636,10 +636,23 @@ void ReportRender::renderDataBand(BandDesignIntf *dataBand)
             bandDatasource->next();
 
             datasources()->setReportVariable(varName,datasources()->variable(varName).toInt()+1);
-            foreach (BandDesignIntf* band, dataBand->childrenByType(BandDesignIntf::GroupHeader)){
-                QString groupLineVar = QLatin1String("line_")+band->objectName().toLower();
-                if (datasources()->containsVariable(groupLineVar))
-                    datasources()->setReportVariable(groupLineVar,datasources()->variable(groupLineVar).toInt()+1);
+
+            QList<BandDesignIntf *> bandList;
+            QList<BandDesignIntf *> childList;
+
+            bandList = dataBand->childrenByType(BandDesignIntf::GroupHeader);
+            while (bandList.size() > 0)
+            {
+                childList.clear();
+                foreach (BandDesignIntf* band, bandList)
+                {
+                    childList.append(band->childrenByType(BandDesignIntf::GroupHeader));
+
+                    QString groupLineVar = QLatin1String("line_")+band->objectName().toLower();
+                    if (datasources()->containsVariable(groupLineVar))
+                        datasources()->setReportVariable(groupLineVar,datasources()->variable(groupLineVar).toInt()+1);
+                }
+                bandList = childList;
             }
 
             renderGroupHeader(dataBand, bandDatasource, false);

From 464e0275ba30efd589e766b599f6a9eadd9181bc Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Mon, 16 Dec 2019 14:37:44 +0300
Subject: [PATCH 2/2] Increased border size

---
 common.pri                      | 2 +-
 limereport/lrbanddesignintf.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.pri b/common.pri
index cff835e..6439752 100644
--- a/common.pri
+++ b/common.pri
@@ -127,7 +127,7 @@ RCC_DIR        = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
 
 LIMEREPORT_VERSION_MAJOR = 1
 LIMEREPORT_VERSION_MINOR = 5
-LIMEREPORT_VERSION_RELEASE = 23
+LIMEREPORT_VERSION_RELEASE = 24
 
 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
 DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"
diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
index 30661bd..20c0dfe 100644
--- a/limereport/lrbanddesignintf.cpp
+++ b/limereport/lrbanddesignintf.cpp
@@ -1123,7 +1123,7 @@ void BandDesignIntf::updateItemSize(DataSourceManager* dataManager, RenderPass p
     if (keepBottomSpace()) spaceBorder = bottomSpace();
     spaceBorder = spaceBorder > 0 ? spaceBorder : 0;
     if (borderLines() != 0){
-        spaceBorder += borderLineSize();
+        spaceBorder += borderLineSize() + 2;
     }
 
     spaceBorder += m_bottomSpace;