RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

LibGfx: Convert line text into a Utf8View before finding its direction

Browse source 
We were accidentally calling TextDirection::get_text_direction with a
String instead of a UtfView, which meant each byte was treated as a
codepoint, resulting in incorrect identification of text direction.
This commit is contained in:
Idan Horowitz 2021-09-04 14:06:25 +03:00 • committed by Andreas Kling
parent 5d732711a2
commit 72b21343ad
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibGfx/Painter.cpp
View file

@ -1472,14 +1472,14 @@ void Painter::do_draw_text(IntRect const& rect, Utf8View const& text, Font const
} }
for (size_t i = 0; i < lines.size(); ++i) { for (size_t i = 0; i < lines.size(); ++i) {
auto& line = lines[i]; auto line = Utf8View { lines[i] };
IntRect line_rect { bounding_rect.x(), bounding_rect.y() + static_cast<int>(i) * line_height, bounding_rect.width(), line_height }; IntRect line_rect { bounding_rect.x(), bounding_rect.y() + static_cast<int>(i) * line_height, bounding_rect.width(), line_height };
line_rect.intersect(rect); line_rect.intersect(rect);
TextDirection line_direction = get_text_direction(line); TextDirection line_direction = get_text_direction(line);
if (text_contains_bidirectional_text(Utf8View { line }, line_direction)) { // Slow Path: The line contains mixed BiDi classes if (text_contains_bidirectional_text(line, line_direction)) { // Slow Path: The line contains mixed BiDi classes
auto directional_runs = split_text_into_directional_runs(Utf8View { line }, line_direction); auto directional_runs = split_text_into_directional_runs(line, line_direction);
auto current_dx = line_direction == TextDirection::LTR ? 0 : line_rect.width(); auto current_dx = line_direction == TextDirection::LTR ? 0 : line_rect.width();
for (auto& directional_run : directional_runs) { for (auto& directional_run : directional_runs) {
auto run_width = font.width(directional_run.text()); auto run_width = font.width(directional_run.text());
@ -1492,14 +1492,14 @@ void Painter::do_draw_text(IntRect const& rect, Utf8View const& text, Font const
// compatible with draw_text_line. // compatible with draw_text_line.
StringBuilder builder; StringBuilder builder;
builder.append(directional_run.text()); builder.append(directional_run.text());
auto text = Utf8View { builder.to_string() }; auto line_text = Utf8View { builder.to_string() };
draw_text_line(run_rect, text, font, alignment, directional_run.direction(), draw_glyph); draw_text_line(run_rect, line_text, font, alignment, directional_run.direction(), draw_glyph);
if (line_direction == TextDirection::LTR) if (line_direction == TextDirection::LTR)
current_dx += run_width; current_dx += run_width;
} }
} else { } else {
draw_text_line(line_rect, Utf8View { line }, font, alignment, line_direction, draw_glyph); draw_text_line(line_rect, line, font, alignment, line_direction, draw_glyph);
} }
} }
} }