[Cupertino] Apply RSuperellipse to most Cupertino widgets #167784

dkwingsmt · 2025-04-25T00:21:17Z

This PR applies RSuperellipse to most Cupertino widgets. I got the list by searching for ClipRRect, drawRRect, and BoxDecoration (with borderRadius) through the package. They're replaced by ClipRSuperellipse, drawRSuperellipse, and ShapeDecoration respectively.

There are a few widgets that I didn't apply:

CupertinoTextField as well as its related widget CupertinoSearchTextField, because CupertinoTextField expects a BoxDecoration argument. Migrating it is nontrivial and will take place in a separate PR.
CupertinoTextSelectionToolbar, because it seems complicated (containing a lot of paths). I wonder if it's possible to replace the clipPath with clipRRect/clipRSe for better performance.
CupertinoSwitch. I suspect it's not an squircle since it tightly contains a full circle.

Fixes #13914.

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 ///).
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.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

MitchellGoodwin

LGTM, with one comment nit. A little surprised these changes avoided our golden tests so far.

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

dkwingsmt · 2025-04-25T18:22:54Z

I looked through the check list and golden tests haven't even been started. I wonder if it only starts with one approval.

flutter-dashboard · 2025-04-25T19:24:15Z

Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change).

If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review.

For more guidance, visit Writing a golden file test for package:flutter.

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Changes reported for pull request #167784 at sha 5d21502

justinmc

LGTM 👍 . I'm excited for squircles everywhere.

Let me know if I can help with anything when you do the CupertinoTextField followup. Maybe we should change its API to match TextField.

justinmc · 2025-04-25T20:07:32Z

packages/flutter/lib/src/cupertino/button.dart

+                      side:
+                          enabled && isFocused


Nit: This formatting looks strange (though it was strange before your change). If you manually put it on one line (side: enabled && isFocused) does the autoformatter undo it?

It sadly does. I've extracted the shapeDecoration to a separate variable, which makes it less bad for being on its own.

…o rse-most-cupertino

flutter-dashboard · 2025-04-29T03:34:37Z

Golden file changes are available for triage from new commit, Click here to view.

For more guidance, visit Writing a golden file test for package:flutter.

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Changes reported for pull request #167784 at sha 9b5aea6

dkwingsmt · 2025-04-29T18:15:04Z

Holding this PR until #167366 is addressed.

…lutter/flutter#167784)

flutter/flutter@4372bfb...0e536eb 2025-05-28 [email protected] Introduces FlutterPluginRegistrant protocol. (flutter/flutter#169399) 2025-05-28 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Initialize `default-flavor` in `FlutterCommand`, adds integration test. (#169298)" (flutter/flutter#169581) 2025-05-28 [email protected] Initialize `default-flavor` in `FlutterCommand`, adds integration test. (flutter/flutter#169298) 2025-05-28 [email protected] Update DEPS to add dart-lang/ai repo (flutter/flutter#169540) 2025-05-28 [email protected] Roll Skia from 92311f2ba0b7 to 82d326fc2148 (1 revision) (flutter/flutter#169552) 2025-05-28 [email protected] dev/bots: improve service worker test code (flutter/flutter#169231) 2025-05-28 [email protected] Make Android team platform view TESTOWNERS (flutter/flutter#169297) 2025-05-28 [email protected] Roll Skia from 044f58f78a73 to 92311f2ba0b7 (9 revisions) (flutter/flutter#169542) 2025-05-27 [email protected] Roll Skia from 443f5257f382 to 044f58f78a73 (16 revisions) (flutter/flutter#169530) 2025-05-27 [email protected] [web] Fix unresponsive input above SelectionArea in Safari and Firefox. (flutter/flutter#167275) 2025-05-27 [email protected] Set pause_isolates_on_start flag if --start-paused (flutter/flutter#169392) 2025-05-27 [email protected] Roll Packages from af0b9a9 to 6eebe72 (24 revisions) (flutter/flutter#169514) 2025-05-27 [email protected] Roll Fuchsia Linux SDK from 5mpmPsuD8rpeiJizT... to nC9hLWjYVlChDTEPh... (flutter/flutter#169498) 2025-05-27 [email protected] Split hint from label and expose it via aria-description or aria-describedby (flutter/flutter#169157) 2025-05-26 [email protected] 🐛 Normalize generated file paths for the l10n generator (flutter/flutter#169467) 2025-05-26 [email protected] Roll Dart SDK from d811152316e4 to 6aeb798bdbe2 (2 revisions) (flutter/flutter#169478) 2025-05-26 [email protected] [Cupertino] Apply RSuperellipse to most Cupertino widgets (flutter/flutter#167784) 2025-05-26 [email protected] Roll `package:dds` to 5.0.2 (flutter/flutter#169471) 2025-05-26 [email protected] Use `.flutter-plugins-dependencies` for crash reporting. (flutter/flutter#169319) 2025-05-26 [email protected] Remove now disabled code that would generate `.flutter-plugins`. (flutter/flutter#169320) 2025-05-26 [email protected] Roll Dart SDK from 7dab9bffe1f7 to d811152316e4 (1 revision) (flutter/flutter#169473) 2025-05-26 [email protected] Precise browser resizing with integration_test and driver (flutter/flutter#160678) 2025-05-26 [email protected] Add `/coverage/` to `.gitignore.tmp` (flutter/flutter#169387) 2025-05-26 [email protected] Make test output with encoded `dart-defines=...` human readable. (flutter/flutter#169353) 2025-05-26 [email protected] Use at most `PROC~/2` tasks to transform assets. (flutter/flutter#169386) 2025-05-26 [email protected] Forward exit code from dart test to flutter test (flutter/flutter#168604) 2025-05-26 [email protected] Fix warning when building for macOS desktop (flutter/flutter#165996) 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] 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

…r#9334) flutter/flutter@4372bfb...0e536eb 2025-05-28 [email protected] Introduces FlutterPluginRegistrant protocol. (flutter/flutter#169399) 2025-05-28 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Initialize `default-flavor` in `FlutterCommand`, adds integration test. (#169298)" (flutter/flutter#169581) 2025-05-28 [email protected] Initialize `default-flavor` in `FlutterCommand`, adds integration test. (flutter/flutter#169298) 2025-05-28 [email protected] Update DEPS to add dart-lang/ai repo (flutter/flutter#169540) 2025-05-28 [email protected] Roll Skia from 92311f2ba0b7 to 82d326fc2148 (1 revision) (flutter/flutter#169552) 2025-05-28 [email protected] dev/bots: improve service worker test code (flutter/flutter#169231) 2025-05-28 [email protected] Make Android team platform view TESTOWNERS (flutter/flutter#169297) 2025-05-28 [email protected] Roll Skia from 044f58f78a73 to 92311f2ba0b7 (9 revisions) (flutter/flutter#169542) 2025-05-27 [email protected] Roll Skia from 443f5257f382 to 044f58f78a73 (16 revisions) (flutter/flutter#169530) 2025-05-27 [email protected] [web] Fix unresponsive input above SelectionArea in Safari and Firefox. (flutter/flutter#167275) 2025-05-27 [email protected] Set pause_isolates_on_start flag if --start-paused (flutter/flutter#169392) 2025-05-27 [email protected] Roll Packages from af0b9a9 to 6eebe72 (24 revisions) (flutter/flutter#169514) 2025-05-27 [email protected] Roll Fuchsia Linux SDK from 5mpmPsuD8rpeiJizT... to nC9hLWjYVlChDTEPh... (flutter/flutter#169498) 2025-05-27 [email protected] Split hint from label and expose it via aria-description or aria-describedby (flutter/flutter#169157) 2025-05-26 [email protected] 🐛 Normalize generated file paths for the l10n generator (flutter/flutter#169467) 2025-05-26 [email protected] Roll Dart SDK from d811152316e4 to 6aeb798bdbe2 (2 revisions) (flutter/flutter#169478) 2025-05-26 [email protected] [Cupertino] Apply RSuperellipse to most Cupertino widgets (flutter/flutter#167784) 2025-05-26 [email protected] Roll `package:dds` to 5.0.2 (flutter/flutter#169471) 2025-05-26 [email protected] Use `.flutter-plugins-dependencies` for crash reporting. (flutter/flutter#169319) 2025-05-26 [email protected] Remove now disabled code that would generate `.flutter-plugins`. (flutter/flutter#169320) 2025-05-26 [email protected] Roll Dart SDK from 7dab9bffe1f7 to d811152316e4 (1 revision) (flutter/flutter#169473) 2025-05-26 [email protected] Precise browser resizing with integration_test and driver (flutter/flutter#160678) 2025-05-26 [email protected] Add `/coverage/` to `.gitignore.tmp` (flutter/flutter#169387) 2025-05-26 [email protected] Make test output with encoded `dart-defines=...` human readable. (flutter/flutter#169353) 2025-05-26 [email protected] Use at most `PROC~/2` tasks to transform assets. (flutter/flutter#169386) 2025-05-26 [email protected] Forward exit code from dart test to flutter test (flutter/flutter#168604) 2025-05-26 [email protected] Fix warning when building for macOS desktop (flutter/flutter#165996) 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] 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

…lutter/flutter#167784)

Impl

74d94b0

github-actions bot added a: text input Entering text in a text field or keyboard related problems framework flutter/packages/flutter repository. See also f: labels. f: cupertino flutter/packages/flutter/cupertino repository labels Apr 25, 2025

dkwingsmt changed the title ~~[Cupertino] Migrate most Cupertino widgets to RSuperellipse~~ [Cupertino] Apply RSuperellipse to most Cupertino widgets Apr 25, 2025

Fix tests

f8d18a3

github-actions bot added the f: routes Navigator, Router, and related APIs. label Apr 25, 2025

Fix analyze

37be780

MitchellGoodwin approved these changes Apr 25, 2025

View reviewed changes

packages/flutter/lib/src/painting/rounded_rectangle_border.dart Outdated Show resolved Hide resolved

dkwingsmt marked this pull request as ready for review April 25, 2025 18:24

Merge branch 'master' into rse-most-cupertino

5d21502

flutter-dashboard bot added the will affect goldens Changes to golden files label Apr 25, 2025

justinmc approved these changes Apr 25, 2025

View reviewed changes

Revert separator and use thumb

842d359

dkwingsmt mentioned this pull request Apr 28, 2025

[Suggestion] Add a way to mark a PR "golden-ready" #167964

Closed

dkwingsmt added 2 commits April 28, 2025 17:20

Migrate drawRRect

b8cf5df

Merge branch 'rse-most-cupertino' of github.com:dkwingsmt/flutter int…

18bb044

…o rse-most-cupertino

github-actions bot added the f: material design flutter/packages/flutter/material repository. label Apr 29, 2025

dkwingsmt added 2 commits April 28, 2025 18:18

Fix material slider test

12f0a47

Merge remote-tracking branch 'origin/main' into rse-most-cupertino

9b5aea6

dkwingsmt marked this pull request as draft April 29, 2025 18:14

dkwingsmt added 5 commits May 22, 2025 15:16

Merge remote-tracking branch 'origin/main' into rse-most-cupertino

eede2bc

Extract shapeDecoration

2bd5b4d

Fix document

18d9a6b

Slight fix

dfa9f53

Merge remote-tracking branch 'origin/main' into rse-most-cupertino

ed62219

flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 26, 2025

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 27, 2025

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

632a0ce

…lutter/flutter#167784)

engine-flutter-autoroll mentioned this pull request May 27, 2025

Roll Flutter from 4372bfbc6c23 to 4e75d56bdab0 (13 revisions) flutter/packages#9323

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 27, 2025

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

f527856

…lutter/flutter#167784)

engine-flutter-autoroll mentioned this pull request May 27, 2025

Roll Flutter from 4372bfbc6c23 to 768932e97299 (14 revisions) flutter/packages#9325

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 27, 2025

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

ca6d425

…lutter/flutter#167784)

engine-flutter-autoroll mentioned this pull request May 27, 2025

Roll Flutter from 4372bfbc6c23 to 184835f7d8f5 (15 revisions) flutter/packages#9326

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 27, 2025

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

a6a6923

…lutter/flutter#167784)

engine-flutter-autoroll mentioned this pull request May 27, 2025

Roll Flutter from 4372bfbc6c23 to 973701688c46 (17 revisions) flutter/packages#9327

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 28, 2025

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

06b26ae

…lutter/flutter#167784)

This was referenced May 28, 2025

Roll Flutter from 4372bfbc6c23 to 5d013c73baa7 (26 revisions) flutter/packages#9333

Closed

Roll Flutter from 4372bfbc6c23 to 0e536eb9fe4b (27 revisions) flutter/packages#9334

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 28, 2025

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

af18180

…lutter/flutter#167784)

Piinks mentioned this pull request Jun 6, 2025

Flutter Notable Commits - 2025 #161460

Open

dkwingsmt mentioned this pull request Jul 9, 2025

[Cupertino] Make some widgets no longer use RSuperellipse #171830

Merged

9 tasks

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

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

4b15dd9

…lutter/flutter#167784)

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

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

d8b02e4

…lutter/flutter#167784)

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

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

d226976

…lutter/flutter#167784)

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

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

0fd7a6c

…lutter/flutter#167784)

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

df5f865a6 [Cupertino] Apply RSuperellipse to most Cupertino widgets (f…

8b8d0e7

…lutter/flutter#167784)

ryanhanks-bestow mentioned this pull request Aug 28, 2025

CupertinoSlidingSegmentedControl in CupertinoNavigationBar renders incorrectly in dark brightness (starting 3.35.0) #174642

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Cupertino] Apply RSuperellipse to most Cupertino widgets #167784

[Cupertino] Apply RSuperellipse to most Cupertino widgets #167784

Uh oh!

dkwingsmt commented Apr 25, 2025 •

edited

Loading

Uh oh!

MitchellGoodwin left a comment

Uh oh!

Uh oh!

dkwingsmt commented Apr 25, 2025 •

edited

Loading

Uh oh!

flutter-dashboard bot commented Apr 25, 2025

Uh oh!

justinmc left a comment

Uh oh!

justinmc Apr 25, 2025

Uh oh!

dkwingsmt May 22, 2025

Uh oh!

flutter-dashboard bot commented Apr 29, 2025

Uh oh!

dkwingsmt commented Apr 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[Cupertino] Apply RSuperellipse to most Cupertino widgets #167784

[Cupertino] Apply RSuperellipse to most Cupertino widgets #167784

Uh oh!

Conversation

dkwingsmt commented Apr 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

MitchellGoodwin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dkwingsmt commented Apr 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

flutter-dashboard bot commented Apr 25, 2025

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

justinmc Apr 25, 2025

Choose a reason for hiding this comment

Uh oh!

dkwingsmt May 22, 2025

Choose a reason for hiding this comment

Uh oh!

flutter-dashboard bot commented Apr 29, 2025

Uh oh!

dkwingsmt commented Apr 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dkwingsmt commented Apr 25, 2025 •

edited

Loading

dkwingsmt commented Apr 25, 2025 •

edited

Loading