From dbb7794d49d184e43e127920bd17bd8fce60a1ed Mon Sep 17 00:00:00 2001 From: FastReports-bot Date: Tue, 13 Feb 2024 12:54:53 +0300 Subject: [PATCH] * sync 2/13/2024 version: 2024.1.6 --- FastReport.Base/BandBase.cs | 6 ++++++ FastReport/Resources/en.xml | 1 + Localization/Russian.frl | 1 + UsedPackages.version | 12 ++++++------ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/FastReport.Base/BandBase.cs b/FastReport.Base/BandBase.cs index 2dae4191..395dd71c 100644 --- a/FastReport.Base/BandBase.cs +++ b/FastReport.Base/BandBase.cs @@ -525,6 +525,7 @@ public override void Assign(Base source) BeforeLayoutEvent = src.BeforeLayoutEvent; AfterLayoutEvent = src.AfterLayoutEvent; RepeatBandNTimes = src.RepeatBandNTimes; + IsLastRow = src.IsLastRow; } internal virtual void UpdateWidth() @@ -741,7 +742,12 @@ public override float CalcHeight() foreach (ReportComponentBase obj in Objects) { if (obj.GrowToBottom) + { obj.Height = Height - obj.Top; + // reserve place for border + if (IsLastRow && obj.Border.Lines.HasFlag(BorderLines.Bottom)) + obj.Height -= Border.BottomLine.Width; + } } OnAfterLayout(EventArgs.Empty); diff --git a/FastReport/Resources/en.xml b/FastReport/Resources/en.xml index 1bafb595..ab47bf95 100644 --- a/FastReport/Resources/en.xml +++ b/FastReport/Resources/en.xml @@ -2382,6 +2382,7 @@ + diff --git a/Localization/Russian.frl b/Localization/Russian.frl index b7a6e541..033d87b7 100644 --- a/Localization/Russian.frl +++ b/Localization/Russian.frl @@ -2181,6 +2181,7 @@ + diff --git a/UsedPackages.version b/UsedPackages.version index dc309e7a..17f8513e 100644 --- a/UsedPackages.version +++ b/UsedPackages.version @@ -6,14 +6,14 @@ [2024.1.0] [2024.1.0] - [2024.1.4] + [2024.1.6] [2024.1.0] - [2024.1.4] + [2024.1.6] - 2024.1.2 - 2024.1.2 + 2024.1.5 + 2024.1.5 2024.1.2 2024.1.0 2024.1.0 @@ -41,9 +41,9 @@ - 2023.2.17 + 2024.1.5 - 2023.2.17 + 2024.1.5 2023.2.16