firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Call BorderRadiusGeometry.lerp where applicable in ShapeBorder subclasses (#24262)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/24257
This commit is contained in:
Jason Simmons 2018-11-14 13:47:48 -08:00 committed by GitHub
parent ff25edd3ad
commit 9f28aefa9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter/lib/src/painting/beveled_rectangle_border.dart
View File

@ -60,7 +60,7 @@ class BeveledRectangleBorder extends ShapeBorder {
if (a is BeveledRectangleBorder) {
return BeveledRectangleBorder(
side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadius.lerp(a.borderRadius, borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t),
);
}
return super.lerpFrom(a, t);
@ -72,7 +72,7 @@ class BeveledRectangleBorder extends ShapeBorder {
if (b is BeveledRectangleBorder) {
return BeveledRectangleBorder(
side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadius.lerp(borderRadius, b.borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t),
);
}
return super.lerpTo(b, t);

29
packages/flutter/lib/src/painting/rounded_rectangle_border.dart
View File

@ -59,7 +59,7 @@ class RoundedRectangleBorder extends ShapeBorder {
if (a is RoundedRectangleBorder) {
return RoundedRectangleBorder(
side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadius.lerp(a.borderRadius, borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t),
);
}
if (a is CircleBorder) {
@ -78,7 +78,7 @@ class RoundedRectangleBorder extends ShapeBorder {
if (b is RoundedRectangleBorder) {
return RoundedRectangleBorder(
side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadius.lerp(borderRadius, b.borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t),
);
}
if (b is CircleBorder) {
@ -151,7 +151,7 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
final BorderSide side;
final BorderRadius borderRadius;
final BorderRadiusGeometry borderRadius;
final double circleness;
@ -175,7 +175,7 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
if (a is RoundedRectangleBorder) {
return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadius.lerp(a.borderRadius, borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t),
circleness: circleness * t,
);
}
@ -189,7 +189,7 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
if (a is _RoundedRectangleToCircleBorder) {
return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadius.lerp(a.borderRadius, borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t),
circleness: ui.lerpDouble(a.circleness, circleness, t),
);
}
@ -201,7 +201,7 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
if (b is RoundedRectangleBorder) {
return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadius.lerp(borderRadius, b.borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t),
circleness: circleness * (1.0 - t),
);
}
@ -215,7 +215,7 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
if (b is _RoundedRectangleToCircleBorder) {
return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadius.lerp(borderRadius, b.borderRadius, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t),
circleness: ui.lerpDouble(circleness, b.circleness, t),
);
}
@ -244,22 +244,23 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
}
}
BorderRadius _adjustBorderRadius(Rect rect) {
BorderRadius _adjustBorderRadius(Rect rect, TextDirection textDirection) {
final BorderRadius resolvedRadius = borderRadius.resolve(textDirection);
if (circleness == 0.0)
return borderRadius;
return BorderRadius.lerp(borderRadius, BorderRadius.circular(rect.shortestSide / 2.0), circleness);
return resolvedRadius;
return BorderRadius.lerp(resolvedRadius, BorderRadius.circular(rect.shortestSide / 2.0), circleness);
}
@override
Path getInnerPath(Rect rect, { TextDirection textDirection }) {
return Path()
..addRRect(_adjustBorderRadius(rect).toRRect(_adjustRect(rect)).deflate(side.width));
..addRRect(_adjustBorderRadius(rect, textDirection).toRRect(_adjustRect(rect)).deflate(side.width));
}
@override
Path getOuterPath(Rect rect, { TextDirection textDirection }) {
return Path()
..addRRect(_adjustBorderRadius(rect).toRRect(_adjustRect(rect)));
..addRRect(_adjustBorderRadius(rect, textDirection).toRRect(_adjustRect(rect)));
}
@override
@ -270,9 +271,9 @@ class _RoundedRectangleToCircleBorder extends ShapeBorder {
case BorderStyle.solid:
final double width = side.width;
if (width == 0.0) {
canvas.drawRRect(_adjustBorderRadius(rect).toRRect(_adjustRect(rect)), side.toPaint());
canvas.drawRRect(_adjustBorderRadius(rect, textDirection).toRRect(_adjustRect(rect)), side.toPaint());
} else {
final RRect outer = _adjustBorderRadius(rect).toRRect(_adjustRect(rect));
final RRect outer = _adjustBorderRadius(rect, textDirection).toRRect(_adjustRect(rect));
final RRect inner = outer.deflate(width);
final Paint paint = Paint()
..color = side.color;

6
packages/flutter/test/painting/rounded_rectangle_border_test.dart
View File

@ -34,6 +34,12 @@ void main() {
strokeWidth: 0.0,
)
);
const RoundedRectangleBorder directional = RoundedRectangleBorder(
borderRadius: BorderRadiusDirectional.only(topStart: Radius.circular(20)),
);
expect(ShapeBorder.lerp(directional, c10, 1.0),
ShapeBorder.lerp(c10, directional, 0.0));
});
test('RoundedRectangleBorder and CircleBorder', () {