Merge pull request #675 from FastReports/sync_branch_2024.1.6

FastReport.OpenSource 2024.1.6
FastReports · Feb 13, 2024 · 4fbb7c9 · 4fbb7c9
2 parents 514efec + dbb7794
commit 4fbb7c9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -2382,6 +2382,7 @@
       <File Text="Working with files"/>
       <Editing Text="Editing"/>
       <Help Text="Help"/>
+      <SelectAll Text="Select all"/>
       <Default Text="Default"/>
       <Info Text="To change the keyboard shortcut, you need to double-click on the desired one, or select and press Enter."/>
       <Command Text="Command"/>

diff --git a/Localization/Russian.frl b/Localization/Russian.frl
@@ -2181,6 +2181,7 @@
       <File Text="Работа с файлами"/>
       <Editing Text="Редактирование"/>
       <Help Text="Помощь"/>
+      <SelectAll Text="Выбрать все"/>
       <Default Text="По умолчанию"/>
       <Command Text="Команда"/>
       <Info Text="Для изменения сочетания клавиш необходимо два раза кликнуть на нужный, либо выбрать и нажать Enter."/>

diff --git a/UsedPackages.version b/UsedPackages.version
@@ -6,14 +6,14 @@
         <FRCompatVersionNET>[2024.1.0]</FRCompatVersionNET>
 
         <FRCompatVersion>[2024.1.0]</FRCompatVersion>
-        <FRCompatSkiaVersion>[2024.1.4]</FRCompatSkiaVersion>
+        <FRCompatSkiaVersion>[2024.1.6]</FRCompatSkiaVersion>
 
         <FRDataVisualizationVersion>[2024.1.0]</FRDataVisualizationVersion>
-        <FRDataVisualizationSkiaVersion>[2024.1.4]</FRDataVisualizationSkiaVersion>
+        <FRDataVisualizationSkiaVersion>[2024.1.6]</FRDataVisualizationSkiaVersion>
 
         <!-- WPF -->
-        <FRWPFVersion>2024.1.2</FRWPFVersion>
-        <FRWPFRoslynPadVersion>2024.1.2</FRWPFRoslynPadVersion>
+        <FRWPFVersion>2024.1.5</FRWPFVersion>
+        <FRWPFRoslynPadVersion>2024.1.5</FRWPFRoslynPadVersion>
         <FRFormsWPFVersion>2024.1.2</FRFormsWPFVersion>
         <FRCompatWPFVersion>2024.1.0</FRCompatWPFVersion>
         <FRDataVisualizationWPFVersion>2024.1.0</FRDataVisualizationWPFVersion>
@@ -41,9 +41,9 @@
 <!-- This group sets version used packages in Demos -->
 	<PropertyGroup>
 
-		<FRCoreVersion>2023.2.17</FRCoreVersion>
+		<FRCoreVersion>2024.1.5</FRCoreVersion>
 
-		<FRCoreWebVersion>2023.2.17</FRCoreWebVersion>
+		<FRCoreWebVersion>2024.1.5</FRCoreWebVersion>
 
 		<FROSVersion>2023.2.16</FROSVersion>