File tree 4 files changed +14
-6
lines changed
4 files changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -525,6 +525,7 @@ public override void Assign(Base source)
525
525
BeforeLayoutEvent = src . BeforeLayoutEvent ;
526
526
AfterLayoutEvent = src . AfterLayoutEvent ;
527
527
RepeatBandNTimes = src . RepeatBandNTimes ;
528
+ IsLastRow = src . IsLastRow ;
528
529
}
529
530
530
531
internal virtual void UpdateWidth ( )
@@ -741,7 +742,12 @@ public override float CalcHeight()
741
742
foreach ( ReportComponentBase obj in Objects )
742
743
{
743
744
if ( obj . GrowToBottom )
745
+ {
744
746
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
+ }
745
751
}
746
752
747
753
OnAfterLayout ( EventArgs . Empty ) ;
Original file line number Diff line number Diff line change 2382
2382
<File Text =" Working with files" />
2383
2383
<Editing Text =" Editing" />
2384
2384
<Help Text =" Help" />
2385
+ <SelectAll Text =" Select all" />
2385
2386
<Default Text =" Default" />
2386
2387
<Info Text =" To change the keyboard shortcut, you need to double-click on the desired one, or select and press Enter." />
2387
2388
<Command Text =" Command" />
Original file line number Diff line number Diff line change 2181
2181
<File Text =" Работа с файлами" />
2182
2182
<Editing Text =" Редактирование" />
2183
2183
<Help Text =" Помощь" />
2184
+ <SelectAll Text =" Выбрать все" />
2184
2185
<Default Text =" По умолчанию" />
2185
2186
<Command Text =" Команда" />
2186
2187
<Info Text =" Для изменения сочетания клавиш необходимо два раза кликнуть на нужный, либо выбрать и нажать Enter." />
Original file line number Diff line number Diff line change 6
6
<FRCompatVersionNET >[2024.1.0]</FRCompatVersionNET >
7
7
8
8
<FRCompatVersion >[2024.1.0]</FRCompatVersion >
9
- <FRCompatSkiaVersion >[2024.1.4 ]</FRCompatSkiaVersion >
9
+ <FRCompatSkiaVersion >[2024.1.6 ]</FRCompatSkiaVersion >
10
10
11
11
<FRDataVisualizationVersion >[2024.1.0]</FRDataVisualizationVersion >
12
- <FRDataVisualizationSkiaVersion >[2024.1.4 ]</FRDataVisualizationSkiaVersion >
12
+ <FRDataVisualizationSkiaVersion >[2024.1.6 ]</FRDataVisualizationSkiaVersion >
13
13
14
14
<!-- 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 >
17
17
<FRFormsWPFVersion >2024.1.2</FRFormsWPFVersion >
18
18
<FRCompatWPFVersion >2024.1.0</FRCompatWPFVersion >
19
19
<FRDataVisualizationWPFVersion >2024.1.0</FRDataVisualizationWPFVersion >
41
41
<!-- This group sets version used packages in Demos -->
42
42
<PropertyGroup >
43
43
44
- <FRCoreVersion >2023.2.17 </FRCoreVersion >
44
+ <FRCoreVersion >2024.1.5 </FRCoreVersion >
45
45
46
- <FRCoreWebVersion >2023.2.17 </FRCoreWebVersion >
46
+ <FRCoreWebVersion >2024.1.5 </FRCoreWebVersion >
47
47
48
48
<FROSVersion >2023.2.16</FROSVersion >
49
49
You can’t perform that action at this time.
0 commit comments