Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing TextPainter.strutStyle to paragraph style #143771

Merged
merged 5 commits into from
Feb 22, 2024
Merged

Add missing TextPainter.strutStyle to paragraph style #143771

merged 5 commits into from
Feb 22, 2024

Conversation

LongCatIsLooong
Copy link
Contributor

@LongCatIsLooong LongCatIsLooong commented Feb 20, 2024 •
edited
Loading

Fixes an issue where if the TextSpan doesn't have a text style, the specified strutStyle is not applied.

Additionally, adds a migration flag for flutter/engine#50385, for internal golden changes. It's only going to exist for a week.

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

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

@github-actions 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. labels Feb 20, 2024
@LongCatIsLooong LongCatIsLooong changed the title Test Add missing TextPainter.strutStyle to paragraph style Feb 21, 2024
@LongCatIsLooong LongCatIsLooong marked this pull request as ready for review February 21, 2024 18:57
justinmc
justinmc approved these changes Feb 21, 2024
View reviewed changes
Copy link
Contributor

@justinmc justinmc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming tests pass 👍

packages/flutter/test/painting/text_painter_test.dart
text: const TextSpan(),
strutStyle: strut,
)..layout();
expect(painter.height, 100);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Why is it 100?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

height * fontSize

@LongCatIsLooong LongCatIsLooong added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 22, 2024
@LongCatIsLooong
Copy link
Contributor Author

Some text fields may become taller after this change. See cl/609427953 and #143903

@auto-submit auto-submit bot merged commit 44e440a into flutter:master Feb 22, 2024
66 checks passed
@LongCatIsLooong LongCatIsLooong mentioned this pull request Feb 22, 2024
Merged
8 tasks
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Feb 23, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2024
@engine-flutter-autoroll
44e440ae9 Add missing TextPainter.strutStyle to paragraph style (fl…
05b64d2 
…utter/flutter#143771)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Feb 23, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2024
@engine-flutter-autoroll
44e440ae9 Add missing TextPainter.strutStyle to paragraph style (fl…
6e291c3 
…utter/flutter#143771)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Feb 23, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2024
@engine-flutter-autoroll
44e440ae9 Add missing TextPainter.strutStyle to paragraph style (fl…
7453d30 
…utter/flutter#143771)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Feb 23, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2024
@engine-flutter-autoroll
44e440ae9 Add missing TextPainter.strutStyle to paragraph style (fl…
84d85d5 
…utter/flutter#143771)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Feb 23, 2024
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 23, 2024
@engine-flutter-autoroll
44e440ae9 Add missing TextPainter.strutStyle to paragraph style (fl…
aa63b4e 
…utter/flutter#143771)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Feb 23, 2024
@engine-flutter-autoroll
Roll Flutter from 41581c9a1b90 to 39585e66c11f (31 revisions) (#6194)
fe6111b 
flutter/flutter@41581c9...39585e6

2024-02-23 jonahwilliams@google.com Re-enable Impeller goldens blocking. (flutter/flutter#144023)
2024-02-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0f3ad23b84ed to 5f99a6c3289e (16 revisions) (flutter/flutter#144028)
2024-02-23 engine-flutter-autoroll@skia.org Roll Packages from 078c2a3 to 7df2085 (3 revisions) (flutter/flutter#144030)
2024-02-23 15619084+vashworth@users.noreply.github.com Run tests on iOS 17 exclusively (flutter/flutter#144022)
2024-02-23 15619084+vashworth@users.noreply.github.com Retry button tap in [FlutterUITests testFlutterViewWarm] (flutter/flutter#143967)
2024-02-23 31859944+LongCatIsLooong@users.noreply.github.com Remove deprecated `InteractiveViewer.alignPanAxis` (flutter/flutter#142500)
2024-02-23 31859944+LongCatIsLooong@users.noreply.github.com Remove deprecated `KeepAliveHandle.release` (flutter/flutter#143961)
2024-02-23 goderbauer@google.com Remove deprecated AnimatedListItemBuilder, AnimatedListRemovedItemBuilder (flutter/flutter#143974)
2024-02-23 engine-flutter-autoroll@skia.org Manual roll Flutter Engine from 06448ee8165f to 0f3ad23b84ed (16 revisions) (flutter/flutter#143989)
2024-02-23 katelovett@google.com Remove deprecated TimelineSummary.writeSummaryToFile (flutter/flutter#143983)
2024-02-23 54558023+keyonghan@users.noreply.github.com Remove unused drone_dimension field (flutter/flutter#143984)
2024-02-23 goderbauer@google.com Remove deprecated MediaQuery.boldTextOverride (flutter/flutter#143960)
2024-02-22 goderbauer@google.com Revert engine back to 06448ee8165f4ff6579ef9510ac69322eda896ac (flutter/flutter#143986)
2024-02-22 katelovett@google.com Remove deprecated FlutterDriver.enableAccessibility (flutter/flutter#143979)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from cb6115d3a6ab to c5d2e011652b (3 revisions) (flutter/flutter#143980)
2024-02-22 36861262+QuncCccccc@users.noreply.github.com Revert "Introduce tone-based surfaces and accent color add-ons - Part 2" (flutter/flutter#143973)
2024-02-22 110420204+dsanagustin@users.noreply.github.com Add CloseButtonTooltip to the 'X' button on a SnackBar (flutter/flutter#143934)
2024-02-22 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.3 to 3.24.4 (flutter/flutter#143971)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 06448ee8165f to cb6115d3a6ab (10 revisions) (flutter/flutter#143972)
2024-02-22 kustermann@google.com Use inlining annotations on important methods for all targets (flutter/flutter#143923)
2024-02-22 31859944+LongCatIsLooong@users.noreply.github.com Add missing `TextPainter.strutStyle` to paragraph style (flutter/flutter#143771)
2024-02-22 zanderso@users.noreply.github.com Shift Moto G4 staging tests to A02s (flutter/flutter#143957)
2024-02-22 sokolovskyi.konstantin@gmail.com Add CurvedAnimation disposals in some widgets (flutter/flutter#143790)
2024-02-22 andrew@divineflame.com Fix documentation typo in basic.dart (flutter/flutter#143887)
2024-02-22 pateltirth454@gmail.com Fixed Small Typo in Emulators Test Name (flutter/flutter#143578)
2024-02-22 derekx@google.com Support using lightweight Flutter Engines to run tests (flutter/flutter#141726)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9250bfdb38c5 to 06448ee8165f (1 revision) (flutter/flutter#143943)
2024-02-22 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Reland Add UI Benchmarks (#143542) (#143799)" (flutter/flutter#143946)
2024-02-22 engine-flutter-autoroll@skia.org Roll Packages from 48048f6 to 078c2a3 (11 revisions) (flutter/flutter#143935)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7777480eb94d to 9250bfdb38c5 (8 revisions) (flutter/flutter#143933)
2024-02-22 bernaferrari2@gmail.com Reland Add UI Benchmarks (#143542) (flutter/flutter#143799)

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 dit@google.com,rmistry@google.com,stuartmorgan@google.com 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
LouiseHsu pushed a commit to LouiseHsu/packages that referenced this pull request Mar 7, 2024
@engine-flutter-autoroll @LouiseHsu
Roll Flutter from 41581c9a1b90 to 39585e66c11f (31 revisions) (flutte…
84dc5ff 
…r#6194)

flutter/flutter@41581c9...39585e6

2024-02-23 jonahwilliams@google.com Re-enable Impeller goldens blocking. (flutter/flutter#144023)
2024-02-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0f3ad23b84ed to 5f99a6c3289e (16 revisions) (flutter/flutter#144028)
2024-02-23 engine-flutter-autoroll@skia.org Roll Packages from 078c2a3 to 7df2085 (3 revisions) (flutter/flutter#144030)
2024-02-23 15619084+vashworth@users.noreply.github.com Run tests on iOS 17 exclusively (flutter/flutter#144022)
2024-02-23 15619084+vashworth@users.noreply.github.com Retry button tap in [FlutterUITests testFlutterViewWarm] (flutter/flutter#143967)
2024-02-23 31859944+LongCatIsLooong@users.noreply.github.com Remove deprecated `InteractiveViewer.alignPanAxis` (flutter/flutter#142500)
2024-02-23 31859944+LongCatIsLooong@users.noreply.github.com Remove deprecated `KeepAliveHandle.release` (flutter/flutter#143961)
2024-02-23 goderbauer@google.com Remove deprecated AnimatedListItemBuilder, AnimatedListRemovedItemBuilder (flutter/flutter#143974)
2024-02-23 engine-flutter-autoroll@skia.org Manual roll Flutter Engine from 06448ee8165f to 0f3ad23b84ed (16 revisions) (flutter/flutter#143989)
2024-02-23 katelovett@google.com Remove deprecated TimelineSummary.writeSummaryToFile (flutter/flutter#143983)
2024-02-23 54558023+keyonghan@users.noreply.github.com Remove unused drone_dimension field (flutter/flutter#143984)
2024-02-23 goderbauer@google.com Remove deprecated MediaQuery.boldTextOverride (flutter/flutter#143960)
2024-02-22 goderbauer@google.com Revert engine back to 06448ee8165f4ff6579ef9510ac69322eda896ac (flutter/flutter#143986)
2024-02-22 katelovett@google.com Remove deprecated FlutterDriver.enableAccessibility (flutter/flutter#143979)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from cb6115d3a6ab to c5d2e011652b (3 revisions) (flutter/flutter#143980)
2024-02-22 36861262+QuncCccccc@users.noreply.github.com Revert "Introduce tone-based surfaces and accent color add-ons - Part 2" (flutter/flutter#143973)
2024-02-22 110420204+dsanagustin@users.noreply.github.com Add CloseButtonTooltip to the 'X' button on a SnackBar (flutter/flutter#143934)
2024-02-22 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.3 to 3.24.4 (flutter/flutter#143971)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 06448ee8165f to cb6115d3a6ab (10 revisions) (flutter/flutter#143972)
2024-02-22 kustermann@google.com Use inlining annotations on important methods for all targets (flutter/flutter#143923)
2024-02-22 31859944+LongCatIsLooong@users.noreply.github.com Add missing `TextPainter.strutStyle` to paragraph style (flutter/flutter#143771)
2024-02-22 zanderso@users.noreply.github.com Shift Moto G4 staging tests to A02s (flutter/flutter#143957)
2024-02-22 sokolovskyi.konstantin@gmail.com Add CurvedAnimation disposals in some widgets (flutter/flutter#143790)
2024-02-22 andrew@divineflame.com Fix documentation typo in basic.dart (flutter/flutter#143887)
2024-02-22 pateltirth454@gmail.com Fixed Small Typo in Emulators Test Name (flutter/flutter#143578)
2024-02-22 derekx@google.com Support using lightweight Flutter Engines to run tests (flutter/flutter#141726)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9250bfdb38c5 to 06448ee8165f (1 revision) (flutter/flutter#143943)
2024-02-22 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Reland Add UI Benchmarks (#143542) (#143799)" (flutter/flutter#143946)
2024-02-22 engine-flutter-autoroll@skia.org Roll Packages from 48048f6 to 078c2a3 (11 revisions) (flutter/flutter#143935)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7777480eb94d to 9250bfdb38c5 (8 revisions) (flutter/flutter#143933)
2024-02-22 bernaferrari2@gmail.com Reland Add UI Benchmarks (#143542) (flutter/flutter#143799)

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 dit@google.com,rmistry@google.com,stuartmorgan@google.com 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
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 14, 2024
@engine-flutter-autoroll
44e440ae9 Add missing TextPainter.strutStyle to paragraph style (fl…
07a298e 
…utter/flutter#143771)
arc-yong pushed a commit to Arctuition/packages-arc that referenced this pull request Jun 14, 2024
@engine-flutter-autoroll @arc-yong
Roll Flutter from 41581c9a1b90 to 39585e66c11f (31 revisions) (flutte…
a371ed4 
…r#6194)

flutter/flutter@41581c9...39585e6

2024-02-23 jonahwilliams@google.com Re-enable Impeller goldens blocking. (flutter/flutter#144023)
2024-02-23 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0f3ad23b84ed to 5f99a6c3289e (16 revisions) (flutter/flutter#144028)
2024-02-23 engine-flutter-autoroll@skia.org Roll Packages from 078c2a3 to 7df2085 (3 revisions) (flutter/flutter#144030)
2024-02-23 15619084+vashworth@users.noreply.github.com Run tests on iOS 17 exclusively (flutter/flutter#144022)
2024-02-23 15619084+vashworth@users.noreply.github.com Retry button tap in [FlutterUITests testFlutterViewWarm] (flutter/flutter#143967)
2024-02-23 31859944+LongCatIsLooong@users.noreply.github.com Remove deprecated `InteractiveViewer.alignPanAxis` (flutter/flutter#142500)
2024-02-23 31859944+LongCatIsLooong@users.noreply.github.com Remove deprecated `KeepAliveHandle.release` (flutter/flutter#143961)
2024-02-23 goderbauer@google.com Remove deprecated AnimatedListItemBuilder, AnimatedListRemovedItemBuilder (flutter/flutter#143974)
2024-02-23 engine-flutter-autoroll@skia.org Manual roll Flutter Engine from 06448ee8165f to 0f3ad23b84ed (16 revisions) (flutter/flutter#143989)
2024-02-23 katelovett@google.com Remove deprecated TimelineSummary.writeSummaryToFile (flutter/flutter#143983)
2024-02-23 54558023+keyonghan@users.noreply.github.com Remove unused drone_dimension field (flutter/flutter#143984)
2024-02-23 goderbauer@google.com Remove deprecated MediaQuery.boldTextOverride (flutter/flutter#143960)
2024-02-22 goderbauer@google.com Revert engine back to 06448ee8165f4ff6579ef9510ac69322eda896ac (flutter/flutter#143986)
2024-02-22 katelovett@google.com Remove deprecated FlutterDriver.enableAccessibility (flutter/flutter#143979)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from cb6115d3a6ab to c5d2e011652b (3 revisions) (flutter/flutter#143980)
2024-02-22 36861262+QuncCccccc@users.noreply.github.com Revert "Introduce tone-based surfaces and accent color add-ons - Part 2" (flutter/flutter#143973)
2024-02-22 110420204+dsanagustin@users.noreply.github.com Add CloseButtonTooltip to the 'X' button on a SnackBar (flutter/flutter#143934)
2024-02-22 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.3 to 3.24.4 (flutter/flutter#143971)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 06448ee8165f to cb6115d3a6ab (10 revisions) (flutter/flutter#143972)
2024-02-22 kustermann@google.com Use inlining annotations on important methods for all targets (flutter/flutter#143923)
2024-02-22 31859944+LongCatIsLooong@users.noreply.github.com Add missing `TextPainter.strutStyle` to paragraph style (flutter/flutter#143771)
2024-02-22 zanderso@users.noreply.github.com Shift Moto G4 staging tests to A02s (flutter/flutter#143957)
2024-02-22 sokolovskyi.konstantin@gmail.com Add CurvedAnimation disposals in some widgets (flutter/flutter#143790)
2024-02-22 andrew@divineflame.com Fix documentation typo in basic.dart (flutter/flutter#143887)
2024-02-22 pateltirth454@gmail.com Fixed Small Typo in Emulators Test Name (flutter/flutter#143578)
2024-02-22 derekx@google.com Support using lightweight Flutter Engines to run tests (flutter/flutter#141726)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9250bfdb38c5 to 06448ee8165f (1 revision) (flutter/flutter#143943)
2024-02-22 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Reland Add UI Benchmarks (#143542) (#143799)" (flutter/flutter#143946)
2024-02-22 engine-flutter-autoroll@skia.org Roll Packages from 48048f6 to 078c2a3 (11 revisions) (flutter/flutter#143935)
2024-02-22 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7777480eb94d to 9250bfdb38c5 (8 revisions) (flutter/flutter#143933)
2024-02-22 bernaferrari2@gmail.com Reland Add UI Benchmarks (#143542) (flutter/flutter#143799)

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 dit@google.com,rmistry@google.com,stuartmorgan@google.com 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmc justinmc justinmc approved these changes

@goderbauer goderbauer Awaiting requested review from goderbauer

Assignees
No one assigned
Labels
a: text input Entering text in a text field or keyboard related problems autosubmit Merge PR when tree becomes green via auto submit App framework flutter/packages/flutter repository. See also f: labels.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@LongCatIsLooong @justinmc