Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

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

Merged
auto-submit 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 1 commit
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
Next Next commit
Make sure to call setHeightOverride as well on TextStyle and StrutS… 
…tyle.
  • Loading branch information
@eyebrowsoffire
eyebrowsoffire committed Feb 23, 2024
commit 9137d28546027b4d1778cc7b11c83bf264bc17e9
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