Skip to content

Commit 4fbb7c9

Browse files
authored
Merge pull request #675 from FastReports/sync_branch_2024.1.6
FastReport.OpenSource 2024.1.6
2 parents 514efec + dbb7794 commit 4fbb7c9

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

FastReport.Base/BandBase.cs

+6
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,7 @@ public override void Assign(Base source)
525525
BeforeLayoutEvent = src.BeforeLayoutEvent;
526526
AfterLayoutEvent = src.AfterLayoutEvent;
527527
RepeatBandNTimes = src.RepeatBandNTimes;
528+
IsLastRow = src.IsLastRow;
528529
}
529530

530531
internal virtual void UpdateWidth()
@@ -741,7 +742,12 @@ public override float CalcHeight()
741742
foreach (ReportComponentBase obj in Objects)
742743
{
743744
if (obj.GrowToBottom)
745+
{
744746
obj.Height = Height - obj.Top;
747+
// reserve place for border
748+
if (IsLastRow && obj.Border.Lines.HasFlag(BorderLines.Bottom))
749+
obj.Height -= Border.BottomLine.Width;
750+
}
745751
}
746752

747753
OnAfterLayout(EventArgs.Empty);

FastReport/Resources/en.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2382,6 +2382,7 @@
23822382
<File Text="Working with files"/>
23832383
<Editing Text="Editing"/>
23842384
<Help Text="Help"/>
2385+
<SelectAll Text="Select all"/>
23852386
<Default Text="Default"/>
23862387
<Info Text="To change the keyboard shortcut, you need to double-click on the desired one, or select and press Enter."/>
23872388
<Command Text="Command"/>

Localization/Russian.frl

+1
Original file line numberDiff line numberDiff line change
@@ -2181,6 +2181,7 @@
21812181
<File Text="Работа с файлами"/>
21822182
<Editing Text="Редактирование"/>
21832183
<Help Text="Помощь"/>
2184+
<SelectAll Text="Выбрать все"/>
21842185
<Default Text="По умолчанию"/>
21852186
<Command Text="Команда"/>
21862187
<Info Text="Для изменения сочетания клавиш необходимо два раза кликнуть на нужный, либо выбрать и нажать Enter."/>

UsedPackages.version

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<FRCompatVersionNET>[2024.1.0]</FRCompatVersionNET>
77

88
<FRCompatVersion>[2024.1.0]</FRCompatVersion>
9-
<FRCompatSkiaVersion>[2024.1.4]</FRCompatSkiaVersion>
9+
<FRCompatSkiaVersion>[2024.1.6]</FRCompatSkiaVersion>
1010

1111
<FRDataVisualizationVersion>[2024.1.0]</FRDataVisualizationVersion>
12-
<FRDataVisualizationSkiaVersion>[2024.1.4]</FRDataVisualizationSkiaVersion>
12+
<FRDataVisualizationSkiaVersion>[2024.1.6]</FRDataVisualizationSkiaVersion>
1313

1414
<!-- WPF -->
15-
<FRWPFVersion>2024.1.2</FRWPFVersion>
16-
<FRWPFRoslynPadVersion>2024.1.2</FRWPFRoslynPadVersion>
15+
<FRWPFVersion>2024.1.5</FRWPFVersion>
16+
<FRWPFRoslynPadVersion>2024.1.5</FRWPFRoslynPadVersion>
1717
<FRFormsWPFVersion>2024.1.2</FRFormsWPFVersion>
1818
<FRCompatWPFVersion>2024.1.0</FRCompatWPFVersion>
1919
<FRDataVisualizationWPFVersion>2024.1.0</FRDataVisualizationWPFVersion>
@@ -41,9 +41,9 @@
4141
<!-- This group sets version used packages in Demos -->
4242
<PropertyGroup>
4343

44-
<FRCoreVersion>2023.2.17</FRCoreVersion>
44+
<FRCoreVersion>2024.1.5</FRCoreVersion>
4545

46-
<FRCoreWebVersion>2023.2.17</FRCoreWebVersion>
46+
<FRCoreWebVersion>2024.1.5</FRCoreWebVersion>
4747

4848
<FROSVersion>2023.2.16</FROSVersion>
4949

0 commit comments

Comments
 (0)