mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-08 09:09:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Strip tabs before text shaping

Browse source 
Handling tabs during text shaping caused issues because we tried to
index 'input_glyph_info' whilst iterating until 'glyph_count' and these
can be different sizes.

The difference is due to when one or more characters get
merged into the same glyph when calling 'input_glyph_info' (see
https://lazka.github.io/pgi-docs/HarfBuzz-0.0/classes/glyph_info_t.html).

We don't want to render tabs as they come up as tofu characters so
instead let's strip them out of the text chunk before starting text
shaping.
This commit is contained in:
Kostya Farber 2024-10-22 13:07:26 +01:00 • committed by Alexander Kalenik
commit 2534e7aeff
Notes: github-actions[bot] 2024-10-22 19:43:50 +00:00
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGfx/TextLayout.cpp
View file

@ -32,8 +32,6 @@ RefPtr<GlyphRun> shape_text(FloatPoint baseline_start, Utf8View string, Gfx::Fon
Vector<Gfx::DrawGlyph> glyph_run; Vector<Gfx::DrawGlyph> glyph_run;
FloatPoint point = baseline_start; FloatPoint point = baseline_start;
for (size_t i = 0; i < glyph_count; ++i) { for (size_t i = 0; i < glyph_count; ++i) {
if (input_glyph_info[i].codepoint == '\t')
continue;
auto position = point auto position = point
- FloatPoint { 0, font.pixel_metrics().ascent } - FloatPoint { 0, font.pixel_metrics().ascent }

2
Userland/Libraries/LibWeb/Layout/InlineLevelIterator.cpp
View file

@ -285,6 +285,8 @@ Optional<InlineLevelIterator::Item> InlineLevelIterator::next_without_lookahead(
} }
tab_stop_dist = tab_stop_dist * num_of_tabs; tab_stop_dist = tab_stop_dist * num_of_tabs;
// remove tabs, we don't want to render them when we shape the text
chunk.view = chunk.view.substring_view(num_of_tabs);
x = tab_stop_dist.to_float(); x = tab_stop_dist.to_float();
} }