AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Position inside family glyph

Browse Source 
Bugs: skia:11104,skia:11023
Change-Id: If94678ddb3f369244739ea3cb6dbf0464f9a2388
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352736
Commit-Queue: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
Julia Lavrova 2021-01-11 15:21:41 -05:00 committed by Skia Commit-Bot
parent 559f9c1253
commit aed808c756
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/skparagraph/src/TextLine.cpp
View File

@ -1171,7 +1171,7 @@ PositionWithAffinity TextLine::getGlyphPositionAtCoordinate(SkScalar dx) {
: SkScalarFloorToInt(delta / averageUtf8Width);
insideGlypheme = averageUtf8Width < delta && delta < glyphemePosWidth - averageUtf8Width;
center = glyphemePosLeft + averageUtf8Width * insideUtf8Offset + averageUtf8Width / 2;
utf16Index += insideUtf8Offset; // TODO: adding a utf8 offset to a utf16 index
// Keep UTF16 index as is
}
if ((dx < center) == context.run->leftToRight() || insideGlypheme) {
result = { SkToS32(utf16Index), kDownstream };

37
modules/skparagraph/tests/SkParagraphTest.cpp
View File

@ -5708,3 +5708,40 @@ DEF_TEST(SkParagraph_RTL_With_Styles, reporter) {
paragraph->layout(300);
paragraph->paint(canvas.get(), 0, 0);
}
DEF_TEST(SkParagraph_PositionInsideEmoji, reporter) {
sk_sp<ResourceFontCollection> fontCollection = sk_make_sp<ResourceFontCollection>();
if (!fontCollection->fontsFound()) return;
TestCanvas canvas("SkParagraph_PositionInsideEmoji.png");
std::u16string text = u"\U0001f469\u200D\U0001f469\u200D\U0001f467\u200D\U0001f467\U0001f469\U0001f469\U0001f467\U0001f467";
ParagraphStyle paragraph_style;
TextStyle text_style;
text_style.setColor(SK_ColorBLACK);
text_style.setFontFamilies({SkString("Noto Color Emoji")});
ParagraphBuilderImpl builder(paragraph_style, fontCollection);
builder.pushStyle(text_style);
builder.addText(text);
auto paragraph = builder.Build();
paragraph->layout(TestCanvasWidth);
paragraph->paint(canvas.get(), 0, 0);
int32_t words[] = { 11, 13, 15, 17, 19, 21};
auto j = 0;
for (auto i : words) {
auto rects = paragraph->getRectsForRange(j, i, RectHeightStyle::kTight, RectWidthStyle::kTight);
if (rects.empty()) {
continue;
}
auto X = rects[0].rect.fRight;
auto Y = rects[0].rect.fTop;
auto res = paragraph->getGlyphPositionAtCoordinate(X, Y);
//SkDebugf("[%d:%d) @%f,%f: %d %s\n", j, i, X, Y, res.position, res.affinity == Affinity::kDownstream ? "D" : "U");
REPORTER_ASSERT(reporter, i == res.position + (res.affinity == Affinity::kDownstream ? 0 : 1));
j = i;
}
}