Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
43044114
Unverified
Commit
43044114
authored
Aug 01, 2022
by
Greg Spencer
Committed by
GitHub
Aug 01, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix lerp to eccentric circle. (#108743)
parent
7f7854fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
star_border.dart
dev/manual_tests/lib/star_border.dart
+2
-2
star_border.dart
packages/flutter/lib/src/painting/star_border.dart
+4
-0
star_border_test.dart
packages/flutter/test/painting/star_border_test.dart
+3
-0
No files found.
dev/manual_tests/lib/star_border.dart
View file @
43044114
...
@@ -501,9 +501,9 @@ ShapeBorder? lerpBorder(StarBorder border, LerpTarget target, double t, {bool to
...
@@ -501,9 +501,9 @@ ShapeBorder? lerpBorder(StarBorder border, LerpTarget target, double t, {bool to
switch
(
target
)
{
switch
(
target
)
{
case
LerpTarget
.
circle
:
case
LerpTarget
.
circle
:
if
(
to
)
{
if
(
to
)
{
return
border
.
lerpTo
(
const
CircleBorder
(
side:
lerpToBorder
),
t
);
return
border
.
lerpTo
(
const
CircleBorder
(
side:
lerpToBorder
,
eccentricity:
0.5
),
t
);
}
else
{
}
else
{
return
border
.
lerpFrom
(
const
CircleBorder
(
side:
lerpToBorder
),
t
);
return
border
.
lerpFrom
(
const
CircleBorder
(
side:
lerpToBorder
,
eccentricity:
0.5
),
t
);
}
}
case
LerpTarget
.
roundedRect
:
case
LerpTarget
.
roundedRect
:
if
(
to
)
{
if
(
to
)
{
...
...
packages/flutter/lib/src/painting/star_border.dart
View file @
43044114
...
@@ -232,6 +232,7 @@ class StarBorder extends OutlinedBorder {
...
@@ -232,6 +232,7 @@ class StarBorder extends OutlinedBorder {
return
StarBorder
(
return
StarBorder
(
side:
BorderSide
.
lerp
(
a
.
side
,
side
,
t
),
side:
BorderSide
.
lerp
(
a
.
side
,
side
,
t
),
points:
lerpedPoints
,
points:
lerpedPoints
,
squash:
ui
.
lerpDouble
(
a
.
eccentricity
,
squash
,
t
)!,
rotation:
rotation
,
rotation:
rotation
,
innerRadiusRatio:
ui
.
lerpDouble
(
math
.
cos
(
math
.
pi
/
lerpedPoints
),
innerRadiusRatio
,
t
)!,
innerRadiusRatio:
ui
.
lerpDouble
(
math
.
cos
(
math
.
pi
/
lerpedPoints
),
innerRadiusRatio
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
1.0
,
pointRounding
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
1.0
,
pointRounding
,
t
)!,
...
@@ -244,6 +245,7 @@ class StarBorder extends OutlinedBorder {
...
@@ -244,6 +245,7 @@ class StarBorder extends OutlinedBorder {
return
StarBorder
(
return
StarBorder
(
side:
BorderSide
.
lerp
(
a
.
side
,
side
,
t
),
side:
BorderSide
.
lerp
(
a
.
side
,
side
,
t
),
points:
lerpedPoints
,
points:
lerpedPoints
,
squash:
ui
.
lerpDouble
(
a
.
eccentricity
,
squash
,
t
)!,
rotation:
rotation
,
rotation:
rotation
,
innerRadiusRatio:
ui
.
lerpDouble
(
1
,
innerRadiusRatio
,
t
)!,
innerRadiusRatio:
ui
.
lerpDouble
(
1
,
innerRadiusRatio
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
0.5
,
pointRounding
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
0.5
,
pointRounding
,
t
)!,
...
@@ -312,6 +314,7 @@ class StarBorder extends OutlinedBorder {
...
@@ -312,6 +314,7 @@ class StarBorder extends OutlinedBorder {
return
StarBorder
(
return
StarBorder
(
side:
BorderSide
.
lerp
(
side
,
b
.
side
,
t
),
side:
BorderSide
.
lerp
(
side
,
b
.
side
,
t
),
points:
lerpedPoints
,
points:
lerpedPoints
,
squash:
ui
.
lerpDouble
(
squash
,
b
.
eccentricity
,
t
)!,
rotation:
rotation
,
rotation:
rotation
,
innerRadiusRatio:
ui
.
lerpDouble
(
innerRadiusRatio
,
math
.
cos
(
math
.
pi
/
lerpedPoints
),
t
)!,
innerRadiusRatio:
ui
.
lerpDouble
(
innerRadiusRatio
,
math
.
cos
(
math
.
pi
/
lerpedPoints
),
t
)!,
pointRounding:
ui
.
lerpDouble
(
pointRounding
,
1.0
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
pointRounding
,
1.0
,
t
)!,
...
@@ -322,6 +325,7 @@ class StarBorder extends OutlinedBorder {
...
@@ -322,6 +325,7 @@ class StarBorder extends OutlinedBorder {
return
StarBorder
(
return
StarBorder
(
side:
BorderSide
.
lerp
(
side
,
b
.
side
,
t
),
side:
BorderSide
.
lerp
(
side
,
b
.
side
,
t
),
points:
lerpedPoints
,
points:
lerpedPoints
,
squash:
ui
.
lerpDouble
(
squash
,
b
.
eccentricity
,
t
)!,
rotation:
rotation
,
rotation:
rotation
,
innerRadiusRatio:
ui
.
lerpDouble
(
innerRadiusRatio
,
1
,
t
)!,
innerRadiusRatio:
ui
.
lerpDouble
(
innerRadiusRatio
,
1
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
pointRounding
,
0.5
,
t
)!,
pointRounding:
ui
.
lerpDouble
(
pointRounding
,
0.5
,
t
)!,
...
...
packages/flutter/test/painting/star_border_test.dart
View file @
43044114
...
@@ -152,12 +152,15 @@ void main() {
...
@@ -152,12 +152,15 @@ void main() {
testWidgets
(
'StarBorder lerped with CircleBorder'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'StarBorder lerped with CircleBorder'
,
(
WidgetTester
tester
)
async
{
const
StarBorder
from
=
StarBorder
();
const
StarBorder
from
=
StarBorder
();
const
ShapeBorder
otherBorder
=
CircleBorder
();
const
ShapeBorder
otherBorder
=
CircleBorder
();
const
ShapeBorder
eccentricCircle
=
CircleBorder
(
eccentricity:
0.6
);
await
testBorder
(
tester
,
'to_circle_border_2'
,
from
,
lerpTo:
otherBorder
,
lerpAmount:
0.2
);
await
testBorder
(
tester
,
'to_circle_border_2'
,
from
,
lerpTo:
otherBorder
,
lerpAmount:
0.2
);
await
testBorder
(
tester
,
'to_circle_border_7'
,
from
,
lerpTo:
otherBorder
,
lerpAmount:
0.7
);
await
testBorder
(
tester
,
'to_circle_border_7'
,
from
,
lerpTo:
otherBorder
,
lerpAmount:
0.7
);
await
testBorder
(
tester
,
'to_circle_border_10'
,
from
,
lerpTo:
otherBorder
,
lerpAmount:
1.0
);
await
testBorder
(
tester
,
'to_circle_border_10'
,
from
,
lerpTo:
otherBorder
,
lerpAmount:
1.0
);
await
testBorder
(
tester
,
'from_circle_border_2'
,
from
,
lerpFrom:
otherBorder
,
lerpAmount:
0.2
);
await
testBorder
(
tester
,
'from_circle_border_2'
,
from
,
lerpFrom:
otherBorder
,
lerpAmount:
0.2
);
await
testBorder
(
tester
,
'from_circle_border_7'
,
from
,
lerpFrom:
otherBorder
,
lerpAmount:
0.7
);
await
testBorder
(
tester
,
'from_circle_border_7'
,
from
,
lerpFrom:
otherBorder
,
lerpAmount:
0.7
);
await
testBorder
(
tester
,
'from_circle_border_10'
,
from
,
lerpFrom:
otherBorder
,
lerpAmount:
1.0
);
await
testBorder
(
tester
,
'from_circle_border_10'
,
from
,
lerpFrom:
otherBorder
,
lerpAmount:
1.0
);
await
testBorder
(
tester
,
'to_eccentric_circle_border'
,
from
,
lerpTo:
eccentricCircle
,
lerpAmount:
0.4
);
await
testBorder
(
tester
,
'from_eccentric_circle_border'
,
from
,
lerpFrom:
eccentricCircle
,
lerpAmount:
0.4
);
});
});
testWidgets
(
'StarBorder lerped with RoundedRectangleBorder'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'StarBorder lerped with RoundedRectangleBorder'
,
(
WidgetTester
tester
)
async
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment