Unverified Commit 1ca2e0b5 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Fix `CastError` in `StadiumBorder.lerpTo` and `StadiumBorder.lerpFrom` when...

Fix `CastError` in `StadiumBorder.lerpTo` and  `StadiumBorder.lerpFrom` when using `BorderRadiusDirectional` (#114826)

* Fix casting in StadiumBorder lerp

* Add tests

* Fix made-up names
parent 585d4457
...@@ -57,7 +57,7 @@ class RoundedRectangleBorder extends OutlinedBorder { ...@@ -57,7 +57,7 @@ class RoundedRectangleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(a.side, side, t), side: BorderSide.lerp(a.side, side, t),
borderRadius: borderRadius, borderRadius: borderRadius,
circleness: 1.0 - t, circularity: 1.0 - t,
eccentricity: a.eccentricity, eccentricity: a.eccentricity,
); );
} }
...@@ -77,7 +77,7 @@ class RoundedRectangleBorder extends OutlinedBorder { ...@@ -77,7 +77,7 @@ class RoundedRectangleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(side, b.side, t), side: BorderSide.lerp(side, b.side, t),
borderRadius: borderRadius, borderRadius: borderRadius,
circleness: t, circularity: t,
eccentricity: b.eccentricity, eccentricity: b.eccentricity,
); );
} }
...@@ -163,14 +163,14 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -163,14 +163,14 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
const _RoundedRectangleToCircleBorder({ const _RoundedRectangleToCircleBorder({
super.side, super.side,
this.borderRadius = BorderRadius.zero, this.borderRadius = BorderRadius.zero,
required this.circleness, required this.circularity,
required this.eccentricity, required this.eccentricity,
}) : assert(side != null), }) : assert(side != null),
assert(borderRadius != null), assert(borderRadius != null),
assert(circleness != null); assert(circularity != null);
final BorderRadiusGeometry borderRadius; final BorderRadiusGeometry borderRadius;
final double circleness; final double circularity;
final double eccentricity; final double eccentricity;
@override @override
...@@ -178,7 +178,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -178,7 +178,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: side.scale(t), side: side.scale(t),
borderRadius: borderRadius * t, borderRadius: borderRadius * t,
circleness: t, circularity: t,
eccentricity: eccentricity, eccentricity: eccentricity,
); );
} }
...@@ -190,7 +190,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -190,7 +190,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(a.side, side, t), side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t)!, borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t)!,
circleness: circleness * t, circularity: circularity * t,
eccentricity: eccentricity, eccentricity: eccentricity,
); );
} }
...@@ -198,7 +198,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -198,7 +198,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(a.side, side, t), side: BorderSide.lerp(a.side, side, t),
borderRadius: borderRadius, borderRadius: borderRadius,
circleness: circleness + (1.0 - circleness) * (1.0 - t), circularity: circularity + (1.0 - circularity) * (1.0 - t),
eccentricity: a.eccentricity, eccentricity: a.eccentricity,
); );
} }
...@@ -206,7 +206,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -206,7 +206,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(a.side, side, t), side: BorderSide.lerp(a.side, side, t),
borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t)!, borderRadius: BorderRadiusGeometry.lerp(a.borderRadius, borderRadius, t)!,
circleness: ui.lerpDouble(a.circleness, circleness, t)!, circularity: ui.lerpDouble(a.circularity, circularity, t)!,
eccentricity: eccentricity, eccentricity: eccentricity,
); );
} }
...@@ -219,7 +219,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -219,7 +219,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(side, b.side, t), side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t)!, borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t)!,
circleness: circleness * (1.0 - t), circularity: circularity * (1.0 - t),
eccentricity: eccentricity, eccentricity: eccentricity,
); );
} }
...@@ -227,7 +227,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -227,7 +227,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(side, b.side, t), side: BorderSide.lerp(side, b.side, t),
borderRadius: borderRadius, borderRadius: borderRadius,
circleness: circleness + (1.0 - circleness) * t, circularity: circularity + (1.0 - circularity) * t,
eccentricity: b.eccentricity, eccentricity: b.eccentricity,
); );
} }
...@@ -235,7 +235,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -235,7 +235,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: BorderSide.lerp(side, b.side, t), side: BorderSide.lerp(side, b.side, t),
borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t)!, borderRadius: BorderRadiusGeometry.lerp(borderRadius, b.borderRadius, t)!,
circleness: ui.lerpDouble(circleness, b.circleness, t)!, circularity: ui.lerpDouble(circularity, b.circularity, t)!,
eccentricity: eccentricity, eccentricity: eccentricity,
); );
} }
...@@ -243,12 +243,12 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -243,12 +243,12 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
} }
Rect _adjustRect(Rect rect) { Rect _adjustRect(Rect rect) {
if (circleness == 0.0 || rect.width == rect.height) { if (circularity == 0.0 || rect.width == rect.height) {
return rect; return rect;
} }
if (rect.width < rect.height) { if (rect.width < rect.height) {
final double partialDelta = (rect.height - rect.width) / 2; final double partialDelta = (rect.height - rect.width) / 2;
final double delta = circleness * partialDelta * (1.0 - eccentricity); final double delta = circularity * partialDelta * (1.0 - eccentricity);
return Rect.fromLTRB( return Rect.fromLTRB(
rect.left, rect.left,
rect.top + delta, rect.top + delta,
...@@ -257,7 +257,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -257,7 +257,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
); );
} else { } else {
final double partialDelta = (rect.width - rect.height) / 2; final double partialDelta = (rect.width - rect.height) / 2;
final double delta = circleness * partialDelta * (1.0 - eccentricity); final double delta = circularity * partialDelta * (1.0 - eccentricity);
return Rect.fromLTRB( return Rect.fromLTRB(
rect.left + delta, rect.left + delta,
rect.top, rect.top,
...@@ -269,7 +269,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -269,7 +269,7 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
BorderRadius? _adjustBorderRadius(Rect rect, TextDirection? textDirection) { BorderRadius? _adjustBorderRadius(Rect rect, TextDirection? textDirection) {
final BorderRadius resolvedRadius = borderRadius.resolve(textDirection); final BorderRadius resolvedRadius = borderRadius.resolve(textDirection);
if (circleness == 0.0) { if (circularity == 0.0) {
return resolvedRadius; return resolvedRadius;
} }
if (eccentricity != 0.0) { if (eccentricity != 0.0) {
...@@ -277,17 +277,17 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -277,17 +277,17 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return BorderRadius.lerp( return BorderRadius.lerp(
resolvedRadius, resolvedRadius,
BorderRadius.all(Radius.elliptical(rect.width / 2, (0.5 + eccentricity / 2) * rect.height / 2)), BorderRadius.all(Radius.elliptical(rect.width / 2, (0.5 + eccentricity / 2) * rect.height / 2)),
circleness, circularity,
)!; )!;
} else { } else {
return BorderRadius.lerp( return BorderRadius.lerp(
resolvedRadius, resolvedRadius,
BorderRadius.all(Radius.elliptical((0.5 + eccentricity / 2) * rect.width / 2, rect.height / 2)), BorderRadius.all(Radius.elliptical((0.5 + eccentricity / 2) * rect.width / 2, rect.height / 2)),
circleness, circularity,
)!; )!;
} }
} }
return BorderRadius.lerp(resolvedRadius, BorderRadius.circular(rect.shortestSide / 2), circleness); return BorderRadius.lerp(resolvedRadius, BorderRadius.circular(rect.shortestSide / 2), circularity);
} }
@override @override
...@@ -318,11 +318,11 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -318,11 +318,11 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
bool get preferPaintInterior => true; bool get preferPaintInterior => true;
@override @override
_RoundedRectangleToCircleBorder copyWith({ BorderSide? side, BorderRadiusGeometry? borderRadius, double? circleness, double? eccentricity }) { _RoundedRectangleToCircleBorder copyWith({ BorderSide? side, BorderRadiusGeometry? borderRadius, double? circularity, double? eccentricity }) {
return _RoundedRectangleToCircleBorder( return _RoundedRectangleToCircleBorder(
side: side ?? this.side, side: side ?? this.side,
borderRadius: borderRadius ?? this.borderRadius, borderRadius: borderRadius ?? this.borderRadius,
circleness: circleness ?? this.circleness, circularity: circularity ?? this.circularity,
eccentricity: eccentricity ?? this.eccentricity, eccentricity: eccentricity ?? this.eccentricity,
); );
} }
...@@ -347,17 +347,17 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder { ...@@ -347,17 +347,17 @@ class _RoundedRectangleToCircleBorder extends OutlinedBorder {
return other is _RoundedRectangleToCircleBorder return other is _RoundedRectangleToCircleBorder
&& other.side == side && other.side == side
&& other.borderRadius == borderRadius && other.borderRadius == borderRadius
&& other.circleness == circleness; && other.circularity == circularity;
} }
@override @override
int get hashCode => Object.hash(side, borderRadius, circleness); int get hashCode => Object.hash(side, borderRadius, circularity);
@override @override
String toString() { String toString() {
if (eccentricity != 0.0) { if (eccentricity != 0.0) {
return 'RoundedRectangleBorder($side, $borderRadius, ${(circleness * 100).toStringAsFixed(1)}% of the way to being a CircleBorder that is ${(eccentricity * 100).toStringAsFixed(1)}% oval)'; return 'RoundedRectangleBorder($side, $borderRadius, ${(circularity * 100).toStringAsFixed(1)}% of the way to being a CircleBorder that is ${(eccentricity * 100).toStringAsFixed(1)}% oval)';
} }
return 'RoundedRectangleBorder($side, $borderRadius, ${(circleness * 100).toStringAsFixed(1)}% of the way to being a CircleBorder)'; return 'RoundedRectangleBorder($side, $borderRadius, ${(circularity * 100).toStringAsFixed(1)}% of the way to being a CircleBorder)';
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment