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

LibGfx: Handle multi-code point emoji widths when drawing text runs

Browse source 
This API is used by LibWeb's text painter. Bring it up to date with the
glyph width computations performed in draw_text_line() used by other GUI
applications.
This commit is contained in:
Timothy Flynn 2023-03-02 07:53:30 -05:00 • committed by Andreas Kling
parent 61f794d473
commit 62f2f0a081
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2489,25 +2489,31 @@ void Painter::draw_text_run(IntPoint baseline_start, Utf8View const& string, Fon
void Painter::draw_text_run(FloatPoint baseline_start, Utf8View const& string, Font const& font, Color color) void Painter::draw_text_run(FloatPoint baseline_start, Utf8View const& string, Font const& font, Color color)
{ {
auto pixel_metrics = font.pixel_metrics(); float space_width = font.glyph_width(' ') + font.glyph_spacing();
float x = baseline_start.x();
float y = baseline_start.y() - pixel_metrics.ascent;
float space_width = font.glyph_width(' ');
u32 last_code_point = 0; u32 last_code_point = 0;
auto point = baseline_start;
point.translate_by(0, -font.pixel_metrics().ascent);
for (auto code_point_iterator = string.begin(); code_point_iterator != string.end(); ++code_point_iterator) { for (auto code_point_iterator = string.begin(); code_point_iterator != string.end(); ++code_point_iterator) {
auto code_point = *code_point_iterator; auto code_point = *code_point_iterator;
if (should_paint_as_space(code_point)) { if (should_paint_as_space(code_point)) {
x += space_width + font.glyph_spacing(); point.translate_by(space_width, 0);
last_code_point = code_point; last_code_point = code_point;
continue; continue;
} }
// FIXME: this is probably not the real space taken for complex emojis auto kerning = font.glyphs_horizontal_kerning(last_code_point, code_point);
x += font.glyphs_horizontal_kerning(last_code_point, code_point); if (kerning != 0.0f)
draw_glyph_or_emoji(FloatPoint { x, y }, code_point_iterator, font, color); point.translate_by(kerning, 0);
x += font.glyph_or_emoji_width(code_point_iterator) + font.glyph_spacing();
auto it = code_point_iterator; // The callback function will advance the iterator, so create a copy for this lookup.
auto glyph_width = font.glyph_or_emoji_width(it) + font.glyph_spacing();
draw_glyph_or_emoji(point, code_point_iterator, font, color);
point.translate_by(glyph_width, 0);
last_code_point = code_point; last_code_point = code_point;
} }
} }