DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Integrate more SkParagraph builder patches (flutter/engine#13094)

Browse Source 
* ParagraphBuilderSkia::AddPlaceholder implementation
* StrutStyle height override
This commit is contained in:
Jason Simmons 2019-10-14 11:17:11 -07:00 committed by GitHub
parent fe46d148f7
commit 1859de2ff0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/src/flutter/third_party/txt/src/skia/paragraph_builder_skia.cc vendored
View File

@ -58,6 +58,7 @@ skt::ParagraphStyle TxtToSkia(const ParagraphStyle& txt) {
MakeSkFontStyle(txt.strut_font_weight, txt.strut_font_style));
strut_style.setFontSize(SkDoubleToScalar(txt.strut_font_size));
strut_style.setHeight(SkDoubleToScalar(txt.strut_height));
strut_style.setHeightOverride(txt.strut_has_height_override);
std::vector<SkString> strut_fonts;
std::transform(txt.strut_font_families.begin(), txt.strut_font_families.end(),
@ -154,7 +155,15 @@ void ParagraphBuilderSkia::AddText(const std::u16string& text) {
}
void ParagraphBuilderSkia::AddPlaceholder(PlaceholderRun& span) {
assert(false);
skt::PlaceholderStyle placeholder_style;
placeholder_style.fHeight = span.height;
placeholder_style.fWidth = span.width;
placeholder_style.fBaseline = static_cast<skt::TextBaseline>(span.baseline);
placeholder_style.fBaselineOffset = span.baseline_offset;
placeholder_style.fAlignment =
static_cast<skt::PlaceholderAlignment>(span.alignment);
builder_->addPlaceholder(placeholder_style);
}
std::unique_ptr<Paragraph> ParagraphBuilderSkia::Build() {