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

Pass the missing strut half leading flag over to skia paragraph builder #50385

Merged
auto-submit merged 7 commits into from
Feb 22, 2024
Merged

Pass the missing strut half leading flag over to skia paragraph builder #50385

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c7c5611
Pass the missing strut half leading over to skia paragraph builder
LongCatIsLooong Feb 6, 2024
d9bec4b
Pass the missing strut half leading flag over to skia paragraph builder
LongCatIsLooong Feb 6, 2024
1ee47bd
Merge branch 'main' into skia_paragraph_builder_strut_half_leading
LongCatIsLooong Feb 14, 2024
3f763c0
Merge branch 'skia_paragraph_builder_strut_half_leading' of github.co…
LongCatIsLooong Feb 14, 2024
8cafa8f
Turn Strut half leading back on in canvaskit kitchensink tests
LongCatIsLooong Feb 15, 2024
4f7ead3
Merge remote-tracking branch 'upstream/main' into skia_paragraph_buil…
LongCatIsLooong Feb 15, 2024
53ff59b
Merge branch 'main' into skia_paragraph_builder_strut_half_leading
LongCatIsLooong Feb 16, 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 third_party/txt/src/skia/paragraph_builder_skia.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ skt::ParagraphStyle ParagraphBuilderSkia::TxtToSkia(const ParagraphStyle& txt) {
strut_style.setFontSize(SkDoubleToScalar(txt.strut_font_size));
strut_style.setHeight(SkDoubleToScalar(txt.strut_height));
strut_style.setHeightOverride(txt.strut_has_height_override);
strut_style.setHalfLeading(txt.strut_half_leading);

std::vector<SkString> strut_fonts;
std::transform(txt.strut_font_families.begin(), txt.strut_font_families.end(),
Expand Down