Include transform in static Gradient lerp methods by Zabadam · Pull Request #149624 · flutter/flutter

Zabadam · 2024-06-03T22:05:15Z

Fixes #149534 Gradient subclasses' static lerp methods drop the GradientTransform of both a and b

LinearGradient.lerp(), RadialGradient.lerp() and SweepGradient.lerp() no longer drop the GradientTransform of a and/or b.

The primitive interpolation is performed the same way TileMode is handled: transform: t < 0.5 ? a.transform : b.transform.

Media

Video demonstration

Before

Gradient.lerp.Loses.GradientTransform.mp4

After

Gradient.lerp.Preserved.Transform.mp4

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
- Changed no documentation.
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
- Non-breaking change.
All existing and new tests are passing.

LinearGradient.lerp(), RadialGradient.lerp() and SweepGradient.lerp() no longer drop the GradientTransform of `a` and/or `b`.

Hixie · 2024-06-06T23:47:40Z

packages/flutter/lib/src/painting/gradient.dart

      tileMode: t < 0.5 ? a.tileMode : b.tileMode, // TODO(ianh): interpolate tile mode
+      transform: t < 0.5 ? a.transform : b.transform,


not a big deal, but if you feel like it, you could remove the TODO on the line above (or alternatively, add one on the new line, with a link to #443)

(same for all three gradients)

Hixie

nate-thegrate

LGTM! 👍

Thanks for noticing the bug and implementing a fix!

nate-thegrate · 2024-06-13T04:15:31Z

packages/flutter/test/painting/gradient_test.dart

+    expect(testGradient1, equals(actual0));
+    expect(testGradient2, equals(actual1));
+    expect(testGradient2, equals(actual2));


Suggested change

expect(testGradient1, equals(actual0));

expect(testGradient2, equals(actual1));

expect(testGradient2, equals(actual2));

expect(actual0, equals(testGradient1));

expect(actual1, equals(testGradient2));

expect(actual2, equals(testGradient2));

Tiny nit: "actual" should be passed as the first argument for expect() (here and below). Not a big deal though, since in this case the test works fine either way.

nate-thegrate · 2024-06-14T00:30:50Z

We can probably merge this now, and then make the aforementioned tweaks the next time we update these functions.

…utter#149624)

flutter/flutter@01db23b...349ec71 2024-06-14 [email protected] Add tests for navigator.0.dart (flutter/flutter#150034) 2024-06-14 [email protected] Switch to `Iterable.cast` instance method (flutter/flutter#150185) 2024-06-14 [email protected] Include transform in static Gradient lerp methods (flutter/flutter#149624) 2024-06-14 [email protected] Validate the `contrastLevel` during `ColorScheme` creation (flutter/flutter#150176) 2024-06-14 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.25.9 to 3.25.10 (flutter/flutter#150228) 2024-06-13 [email protected] Fix leaky test. (flutter/flutter#150235) 2024-06-13 [email protected] Document CIPD role & login for upgrading Android engine (flutter/flutter#149433) 2024-06-13 [email protected] Update doc for `ColorScheme.surface` (flutter/flutter#150212) 2024-06-13 [email protected] Roll pub packages (flutter/flutter#150206) 2024-06-13 [email protected] Bump new release for a11y_assessment (flutter/flutter#150213) 2024-06-13 [email protected] Use --(no-)strip-wams instead of --(no-)-name-section in `dart compile wasm` (flutter/flutter#149641) 2024-06-13 [email protected] Reland "Identify and re-throw our dependency checking errors in flutter.groovy" (flutter/flutter#150128) 2024-06-13 [email protected] Use --(no-)strip-wams instead of --(no-)-name-section in `dart compile wasm` (flutter/flutter#150180) 2024-06-13 [email protected] Suppress Flutter update check if `--machine` is present at all. (flutter/flutter#150138) 2024-06-13 [email protected] [Reland] Introduce `ChipAnimationStyle` to override default chips animations durations (flutter/flutter#149876) 2024-06-13 [email protected] Update framework and flutter fix flutter.dev/docs links (flutter/flutter#150174) 2024-06-13 [email protected] Roll Flutter Engine from 4cb3025d3abf to 8167dffd1914 (2 revisions) (flutter/flutter#150208) 2024-06-13 [email protected] Replace InputDecorator M3 golden test (flutter/flutter#150111) 2024-06-13 [email protected] Roll Packages from 260102b to 7805455 (2 revisions) (flutter/flutter#150198) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

*Fixes flutter#149534 Gradient subclasses' static lerp methods drop the GradientTransform of both `a` and `b`* LinearGradient.lerp(), RadialGradient.lerp() and SweepGradient.lerp() no longer drop the GradientTransform of `a` and/or `b`. The primitive interpolation is performed the same way TileMode is handled: `transform: t < 0.5 ? a.transform : b.transform`. ## Media <details> <summary>Video demonstration</summary> ### Before https://github.com/flutter/flutter/assets/65806473/de14e201-b1a7-44ba-95ff-e62587c7f6ac ### After https://github.com/flutter/flutter/assets/65806473/d48f40e2-1b0f-4ac8-a45c-b3c423e3fd64 </details> - Changed no documentation. - Non-breaking change.

…utter#149624)

Zabadam added 2 commits June 3, 2024 15:04

Include transform in static Gradient lerp methods

042fd1b

LinearGradient.lerp(), RadialGradient.lerp() and SweepGradient.lerp() no longer drop the GradientTransform of `a` and/or `b`.

Added gradient lerp tests with transforms

eb7ad38

github-actions bot added the framework flutter/packages/flutter repository. See also f: labels. label Jun 3, 2024

goderbauer requested a review from Hixie June 4, 2024 22:04

Hixie reviewed Jun 6, 2024

View reviewed changes

Hixie approved these changes Jun 6, 2024

View reviewed changes

goderbauer requested a review from nate-thegrate June 12, 2024 22:09

nate-thegrate approved these changes Jun 13, 2024

View reviewed changes

nate-thegrate added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 14, 2024

auto-submit bot merged commit 43e71ae into flutter:master Jun 14, 2024

engine-flutter-autoroll mentioned this pull request Jun 14, 2024

Roll Flutter from 01db23b82233 to 349ec7183cd0 (19 revisions) flutter/packages#6926

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 14, 2024

43e71ae Include transform in static Gradient lerp methods (flutter/fl…

64deb12

…utter#149624)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 6, 2024

43e71ae Include transform in static Gradient lerp methods (flutter/fl…

21a394d

…utter#149624)

Zabadam mentioned this pull request Aug 23, 2024

Changing gradient transforms doesn't re-render the widget #91952

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Include transform in static Gradient lerp methods#149624

Include transform in static Gradient lerp methods#149624
auto-submit[bot] merged 2 commits intoflutter:masterfrom
Zabadam:gradient-lerp-transform

Zabadam commented Jun 3, 2024

Uh oh!

Hixie Jun 6, 2024

Uh oh!

Hixie left a comment

Uh oh!

nate-thegrate left a comment

Uh oh!

nate-thegrate Jun 13, 2024

Uh oh!

nate-thegrate commented Jun 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		tileMode: t < 0.5 ? a.tileMode : b.tileMode, // TODO(ianh): interpolate tile mode
		transform: t < 0.5 ? a.transform : b.transform,

Conversation

Zabadam commented Jun 3, 2024

Media

Before

After

Pre-launch Checklist

Uh oh!

Hixie Jun 6, 2024

Choose a reason for hiding this comment

Uh oh!

Hixie left a comment

Choose a reason for hiding this comment

Uh oh!

nate-thegrate left a comment

Choose a reason for hiding this comment

Uh oh!

nate-thegrate Jun 13, 2024

Choose a reason for hiding this comment

Uh oh!

nate-thegrate commented Jun 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants