Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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