system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibGfx: Take into account unicode ranges to find font for space glyph

Browse source 
Instead of assuming that the first font in the cascade font list will
have a glyph for space, we need to find it in the list taking into
account unicode ranges.
This commit is contained in:
Aliaksandr Kalenik 2024-01-08 00:10:10 +01:00 committed by Andreas Kling
parent 8b32f4ae7a
commit 5c02b960ab
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Tests/LibWeb/Ref/reference/space-glyph-width-ref.html Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<style>
.text {
font-size: 100px;
}
</style>
</head>
<body>
<div class="text">A B</div>
</body>
</html>

21
Tests/LibWeb/Ref/space-glyph-width.html Normal file
View file

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<link rel="match" href="reference/space-glyph-width-ref.html" />
<style>
@font-face {
font-family: 'HashFont';
src: url('assets/HashSans.woff');
unicode-range: U+0;
}
.text {
font-family: 'HashFont', 'SerenitySans';
font-size: 100px;
}
</style>
</head>
<body>
<div class="text">A B</div>
</body>
</html>

3
Userland/Libraries/LibGfx/TextLayout.h
View file

@ -105,7 +105,8 @@ Variant<DrawGlyph, DrawEmoji> prepare_draw_glyph_or_emoji(FloatPoint point, Utf8
template<typename Callback>
void for_each_glyph_position(FloatPoint baseline_start, Utf8View string, FontCascadeList const& font_list, Callback callback, IncludeLeftBearing include_left_bearing = IncludeLeftBearing::No, Optional<float&> width = {})
{
float space_width = font_list.first().glyph_width(' ') + font_list.first().glyph_spacing();
auto const& space_glyph_font = font_list.font_for_code_point(' ');
float space_width = space_glyph_font.glyph_width(' ') + space_glyph_font.glyph_spacing();
u32 last_code_point = 0;