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

Track clusters and return cluster boundaries in getGlyphPositionForCoordinates (emoji fix) (#10063)

Browse Source
This commit is contained in:
Gary Qian 2019-07-23 16:44:30 -07:00 committed by GitHub
parent e8fb641f61
commit 3c76b90b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 154 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
third_party/txt/src/txt/paragraph_txt.cc vendored
View File

@ -193,9 +193,11 @@ static const float kDoubleDecorationSpacing = 3.0f;
ParagraphTxt::GlyphPosition::GlyphPosition(double x_start,
double x_advance,
size_t code_unit_index,
size_t code_unit_width)
size_t code_unit_width,
size_t cluster)
: code_units(code_unit_index, code_unit_index + code_unit_width),
x_pos(x_start, x_start + x_advance) {}
x_pos(x_start, x_start + x_advance),
cluster(cluster) {}
void ParagraphTxt::GlyphPosition::Shift(double delta) {
x_pos.Shift(delta);
@ -881,13 +883,11 @@ void ParagraphTxt::Layout(double width) {
builder.allocRunPos(font, glyph_blob.end - glyph_blob.start);
double justify_x_offset_delta = 0;
for (size_t glyph_index = glyph_blob.start;
glyph_index < glyph_blob.end;) {
size_t cluster_start_glyph_index = glyph_index;
uint32_t cluster = layout.getGlyphCluster(cluster_start_glyph_index);
double glyph_x_offset;
// Add all the glyphs in this cluster to the text blob.
do {
size_t blob_index = glyph_index - glyph_blob.start;
@ -946,7 +946,7 @@ void ParagraphTxt::Layout(double width) {
glyph_positions.emplace_back(run_x_offset + glyph_x_offset,
grapheme_advance,
run.start() + glyph_code_units.start,
grapheme_code_unit_counts[0]);
grapheme_code_unit_counts[0], cluster);
// Compute positions for the additional graphemes in the ligature.
for (size_t i = 1; i < grapheme_code_unit_counts.size(); ++i) {
@ -954,7 +954,7 @@ void ParagraphTxt::Layout(double width) {
glyph_positions.back().x_pos.end, grapheme_advance,
glyph_positions.back().code_units.start +
grapheme_code_unit_counts[i - 1],
grapheme_code_unit_counts[i]);
grapheme_code_unit_counts[i], cluster);
}
bool at_word_start = false;
@ -1772,12 +1772,28 @@ Paragraph::PositionWithAffinity ParagraphTxt::GetGlyphPositionAtCoordinate(
size_t x_index;
const GlyphPosition* gp = nullptr;
const GlyphPosition* gp_cluster = nullptr;
bool is_cluster_corection = false;
for (x_index = 0; x_index < line_glyph_position.size(); ++x_index) {
double glyph_end = (x_index < line_glyph_position.size() - 1)
? line_glyph_position[x_index + 1].x_pos.start
: line_glyph_position[x_index].x_pos.end;
if (gp_cluster == nullptr ||
gp_cluster->cluster != line_glyph_position[x_index].cluster) {
gp_cluster = &line_glyph_position[x_index];
}
if (dx < glyph_end) {
gp = &line_glyph_position[x_index];
// Check if the glyph position is part of a cluster. If it is,
// we assign the cluster's root GlyphPosition to represent it.
if (gp_cluster->cluster == line_glyph_position[x_index].cluster) {
gp = gp_cluster;
// Detect if the matching GlyphPosition was non-root for the cluster.
if (gp_cluster != &line_glyph_position[x_index]) {
is_cluster_corection = true;
}
} else {
gp = &line_glyph_position[x_index];
}
break;
}
}
@ -1798,8 +1814,13 @@ Paragraph::PositionWithAffinity ParagraphTxt::GetGlyphPositionAtCoordinate(
}
double glyph_center = (gp->x_pos.start + gp->x_pos.end) / 2;
// We want to use the root cluster's start when the cluster
// was corrected.
// TODO(garyq): Detect if the position is in the middle of the cluster
// and properly assign the start/end positions.
if ((direction == TextDirection::ltr && dx < glyph_center) ||
(direction == TextDirection::rtl && dx >= glyph_center)) {
(direction == TextDirection::rtl && dx >= glyph_center) ||
is_cluster_corection) {
return PositionWithAffinity(gp->code_units.start, DOWNSTREAM);
} else {
return PositionWithAffinity(gp->code_units.end, UPSTREAM);

9
third_party/txt/src/txt/paragraph_txt.h vendored
View File

@ -139,6 +139,7 @@ class ParagraphTxt : public Paragraph {
FRIEND_TEST(ParagraphTest, KernScaleParagraph);
FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, NewlineParagraph);
FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, EmojiParagraph);
FRIEND_TEST_WINDOWS_DISABLED(ParagraphTest, EmojiMultiLineRectsParagraph);
FRIEND_TEST(ParagraphTest, HyphenBreakParagraph);
FRIEND_TEST(ParagraphTest, RepeatLayoutParagraph);
FRIEND_TEST(ParagraphTest, Ellipsize);
@ -262,11 +263,17 @@ class ParagraphTxt : public Paragraph {
struct GlyphPosition {
Range<size_t> code_units;
Range<double> x_pos;
// Tracks the cluster that this glyph position belongs to. For example, in
// extended emojis, multiple glyph positions will have the same cluster. The
// cluster can be used as a key to distinguish between codepoints that
// contribute to the drawing of a single glyph.
size_t cluster;
GlyphPosition(double x_start,
double x_advance,
size_t code_unit_index,
size_t code_unit_width);
size_t code_unit_width,
size_t cluster);
void Shift(double delta);
};

117
third_party/txt/tests/paragraph_unittests.cc vendored
View File

@ -4042,6 +4042,123 @@ TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(EmojiParagraph)) {
EXPECT_EQ(paragraph->records_[7].line(), 7ull);
}
TEST_F(ParagraphTest, DISABLE_ON_WINDOWS(EmojiMultiLineRectsParagraph)) {
// clang-format off
const char* text =
"👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧i🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
"👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
"👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
"👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸👩‍👩‍👦👩‍👩‍👧‍👧🇺🇸"
"❄🍕🍔🍟🥝🍱🕶🎩🏈⚽🚴‍♀️🎻🎼🎹🚨🚎🚐⚓🛳🚀🚁🏪🏢🖱⏰📱💾💉📉🛏🔑🔓"
"📁🗓📊❤💯🚫🔻♠♣🕓❗🏳🏁🏳️‍🌈🇮🇹🇱🇷🇺🇸🇬🇧🇨🇳🇧🇴";
// clang-format on
auto icu_text = icu::UnicodeString::fromUTF8(text);
std::u16string u16_text(icu_text.getBuffer(),
icu_text.getBuffer() + icu_text.length());
txt::ParagraphStyle paragraph_style;
txt::ParagraphBuilderTxt builder(paragraph_style, GetTestFontCollection());
txt::TextStyle text_style;
text_style.color = SK_ColorBLACK;
text_style.font_families = std::vector<std::string>(1, "Noto Color Emoji");
text_style.font_size = 50;
builder.PushStyle(text_style);
builder.AddText(u16_text);
builder.Pop();
auto paragraph = BuildParagraph(builder);
paragraph->Layout(GetTestCanvasWidth() - 300);
paragraph->Paint(GetCanvas(), 0, 0);
for (size_t i = 0; i < u16_text.length(); i++) {
ASSERT_EQ(paragraph->text_[i], u16_text[i]);
}
ASSERT_EQ(paragraph->records_.size(), 10ull);
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
paint.setAntiAlias(true);
paint.setStrokeWidth(1);
// Tests for GetRectsForRange()
Paragraph::RectHeightStyle rect_height_style =
Paragraph::RectHeightStyle::kTight;
Paragraph::RectWidthStyle rect_width_style =
Paragraph::RectWidthStyle::kTight;
paint.setColor(SK_ColorRED);
std::vector<txt::Paragraph::TextBox> boxes =
paragraph->GetRectsForRange(0, 0, rect_height_style, rect_width_style);
for (size_t i = 0; i < boxes.size(); ++i) {
GetCanvas()->drawRect(boxes[i].rect, paint);
}
EXPECT_EQ(boxes.size(), 0ull);
// Ligature style indexing.
boxes =
paragraph->GetRectsForRange(0, 119, rect_height_style, rect_width_style);
for (size_t i = 0; i < boxes.size(); ++i) {
GetCanvas()->drawRect(boxes[i].rect, paint);
}
EXPECT_EQ(boxes.size(), 2ull);
EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
EXPECT_FLOAT_EQ(boxes[1].rect.right(), 334.61475);
boxes = paragraph->GetRectsForRange(122, 132, rect_height_style,
rect_width_style);
paint.setColor(SK_ColorBLUE);
for (size_t i = 0; i < boxes.size(); ++i) {
GetCanvas()->drawRect(boxes[i].rect, paint);
}
EXPECT_EQ(boxes.size(), 1ull);
EXPECT_FLOAT_EQ(boxes[0].rect.left(), 357.95996);
EXPECT_FLOAT_EQ(boxes[0].rect.right(), 418.79901);
// GetPositionForCoordinates should not return inter-emoji positions.
boxes = paragraph->GetRectsForRange(
0, paragraph->GetGlyphPositionAtCoordinate(610, 100).position,
rect_height_style, rect_width_style);
paint.setColor(SK_ColorGREEN);
for (size_t i = 0; i < boxes.size(); ++i) {
GetCanvas()->drawRect(boxes[i].rect, paint);
}
EXPECT_EQ(boxes.size(), 2ull);
EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
// The following is expected to change to a higher value when
// rounding up is added to getGlyphPositionForCoordinate.
EXPECT_FLOAT_EQ(boxes[1].rect.right(), 560.28516);
boxes = paragraph->GetRectsForRange(
0, paragraph->GetGlyphPositionAtCoordinate(580, 100).position,
rect_height_style, rect_width_style);
paint.setColor(SK_ColorGREEN);
for (size_t i = 0; i < boxes.size(); ++i) {
GetCanvas()->drawRect(boxes[i].rect, paint);
}
EXPECT_EQ(boxes.size(), 2ull);
EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
EXPECT_FLOAT_EQ(boxes[1].rect.right(), 560.28516);
boxes = paragraph->GetRectsForRange(
0, paragraph->GetGlyphPositionAtCoordinate(560, 100).position,
rect_height_style, rect_width_style);
paint.setColor(SK_ColorGREEN);
for (size_t i = 0; i < boxes.size(); ++i) {
GetCanvas()->drawRect(boxes[i].rect, paint);
}
EXPECT_EQ(boxes.size(), 2ull);
EXPECT_FLOAT_EQ(boxes[1].rect.left(), 0);
// The following is expected to change to the 560.28516 value when
// rounding up is added to getGlyphPositionForCoordinate.
EXPECT_FLOAT_EQ(boxes[1].rect.right(), 498.03125);
ASSERT_TRUE(Snapshot());
}
TEST_F(ParagraphTest, HyphenBreakParagraph) {
const char* text =
"A "