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

Make sure to call setHeightOverride as well on TextStyle and StrutStyle #50920

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Make sure to call setHeightOverride as well on TextStyle and StrutStyle #50920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9137d28
Make sure to call `setHeightOverride` as well on TextStyle and StrutS…
eyebrowsoffire Feb 23, 2024
2c5f54c
Add test for overriding text height.
eyebrowsoffire Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/web_ui/skwasm/text/strut_style.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ SKWASM_EXPORT void strutStyle_setFontSize(StrutStyle* style,

SKWASM_EXPORT void strutStyle_setHeight(StrutStyle* style, SkScalar height) {
style->setHeight(height);
style->setHeightOverride(true);
}

SKWASM_EXPORT void strutStyle_setHalfLeading(StrutStyle* style,
Expand Down
1 change: 1 addition & 0 deletions lib/web_ui/skwasm/text/text_style.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ SKWASM_EXPORT void textStyle_setWordSpacing(TextStyle* style,

SKWASM_EXPORT void textStyle_setHeight(TextStyle* style, SkScalar height) {
style->setHeight(height);
style->setHeightOverride(true);
}

SKWASM_EXPORT void textStyle_setHalfLeading(TextStyle* style,
Expand Down
5 changes: 5 additions & 0 deletions lib/web_ui/test/ui/text_golden_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ Future<void> testMain() async {
layoutWidth: 50, paragraphHeight: 1.5);
});

test('text styles - text style height overriding paragraph height', () async {
await testTextStyle('text style height and paragraph style height',
layoutWidth: 50, paragraphHeight: 1.5, height: 2.0);
});

test('text styles - paragraph text height behavior', () async {
await testTextStyle('paragraph text height behavior',
layoutWidth: 50,
Expand Down