Skip to content

Commit 97b0523

Browse files
committed
Fix TableBorder.lerp and scale dropping borderRadius
1 parent 4e9c63a commit 97b0523

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

‎packages/flutter/lib/src/rendering/table_border.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ class TableBorder {
222222
left: left.scale(t),
223223
horizontalInside: horizontalInside.scale(t),
224224
verticalInside: verticalInside.scale(t),
225+
borderRadius: borderRadius * t,
225226
);
226227
}
227228

@@ -248,6 +249,7 @@ class TableBorder {
248249
left: BorderSide.lerp(a.left, b.left, t),
249250
horizontalInside: BorderSide.lerp(a.horizontalInside, b.horizontalInside, t),
250251
verticalInside: BorderSide.lerp(a.verticalInside, b.verticalInside, t),
252+
borderRadius: BorderRadius.lerp(a.borderRadius, b.borderRadius, t)!,
251253
);
252254
}
253255

‎packages/flutter/test/rendering/table_border_test.dart‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,25 @@ void main() {
6464
);
6565
});
6666

67+
test('TableBorder.scale scales borderRadius', () {
68+
final border = TableBorder.all(borderRadius: const BorderRadius.all(Radius.circular(8.0)));
69+
expect(border.scale(0.5).borderRadius, const BorderRadius.all(Radius.circular(4.0)));
70+
});
71+
72+
test('TableBorder.lerp interpolates borderRadius', () {
73+
final a = TableBorder.all(borderRadius: const BorderRadius.all(Radius.circular(4.0)));
74+
final b = TableBorder.all(borderRadius: const BorderRadius.all(Radius.circular(12.0)));
75+
expect(TableBorder.lerp(a, b, 0.5)!.borderRadius, const BorderRadius.all(Radius.circular(8.0)));
76+
expect(
77+
TableBorder.lerp(null, b, 0.25)!.borderRadius,
78+
const BorderRadius.all(Radius.circular(3.0)),
79+
);
80+
expect(
81+
TableBorder.lerp(a, null, 0.25)!.borderRadius,
82+
const BorderRadius.all(Radius.circular(3.0)),
83+
);
84+
});
85+
6786
test('TableBorder.lerp', () {
6887
const side1 = BorderSide(color: Color(0x00000001));
6988
const side2 = BorderSide(width: 2.0, color: Color(0x00000002));

0 commit comments

Comments
 (0)