RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:37:35 +00:00
Code Issues Activity Actions

LibGfx+AK: Make text elision work with multi-byte characters

Browse source 
This was causing WindowServer and Taskbar to crash sometimes when the
stars aligned and we tried cutting off a string ending with "..." right
on top of an emoji. :^)
This commit is contained in:
Andreas Kling 2020-12-28 23:51:24 +01:00
parent 9af33e2e4b
commit 13594b7146
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibGfx/Painter.cpp
View file

@ -918,7 +918,8 @@ void draw_text_line(const IntRect& a_rect, const TextType& text, const Font& fon
int new_width = font.width("...");
if (new_width < text_width) {
size_t offset = 0;
for (auto code_point : text) {
for (auto it = text.begin(); it != text.end(); ++it) {
auto code_point = *it;
int glyph_width = font.glyph_or_emoji_width(code_point);
// NOTE: Glyph spacing should not be added after the last glyph on the line,
// but since we are here because the last glyph does not actually fit on the line,
@ -927,7 +928,7 @@ void draw_text_line(const IntRect& a_rect, const TextType& text, const Font& fon
if (width_with_this_glyph_included > rect.width())
break;
new_width += glyph_width + glyph_spacing;
offset++;
offset = text.iterator_offset(it);
}
apply_elision(final_text, elided_text, offset);
}