0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Improve fallback font selection

Browse source 
Try to find a font that has at least some of the requested properties.
This makes e.g. rfcs on tools.ietf.org easier to read since their
headers are now bold.
This commit is contained in:
Simon Danner 2021-04-22 20:47:47 +02:00 • committed by GitHub
parent 7ab8be9e0b
commit c8d56ee4f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: sideshowbarker 2024-07-18 19:14:20 +09:00
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Userland/Libraries/LibWeb/CSS/StyleProperties.cpp
View file

@ -92,10 +92,15 @@ void StyleProperties::load_font() const
auto family_parts = family_value.split(',');
auto family = family_parts[0];
if (family.is_one_of("monospace", "ui-monospace"))
auto monospace = false;
auto bold = false;
if (family.is_one_of("monospace", "ui-monospace")) {
monospace = true;
family = "Csilla";
else if (family.is_one_of("serif", "sans-serif", "cursive", "fantasy", "ui-serif", "ui-sans-serif", "ui-rounded"))
} else if (family.is_one_of("serif", "sans-serif", "cursive", "fantasy", "ui-serif", "ui-sans-serif", "ui-rounded")) {
family = "Katica";
}
int weight = 400;
if (font_weight->is_identifier()) {
@ -127,6 +132,8 @@ void StyleProperties::load_font() const
weight = 900;
}
bold = weight > 400;
int size = 10;
if (font_size->is_identifier()) {
switch (static_cast<const IdentifierStyleValue&>(*font_size).id()) {
@ -177,13 +184,27 @@ void StyleProperties::load_font() const
if (!found_font) {
dbgln("Font not found: '{}' {} {}", family, size, weight);
found_font = Gfx::FontDatabase::default_font();
found_font = font_fallback(monospace, bold);
}
m_font = found_font;
FontCache::the().set(font_selector, *m_font);
}
RefPtr<Gfx::Font> StyleProperties::font_fallback(bool monospace, bool bold) const
{
if (monospace && bold)
return Gfx::FontDatabase::default_bold_fixed_width_font();
if (monospace)
return Gfx::FontDatabase::default_fixed_width_font();
if (bold)
return Gfx::FontDatabase::default_bold_font();
return Gfx::FontDatabase::default_font();
}
float StyleProperties::line_height(const Layout::Node& layout_node) const
{
auto line_height_length = length_or_fallback(CSS::PropertyID::LineHeight, Length::make_auto());

1
Userland/Libraries/LibWeb/CSS/StyleProperties.h
View file

@ -76,6 +76,7 @@ private:
Optional<CSS::Overflow> overflow(CSS::PropertyID) const;
void load_font() const;
RefPtr<Gfx::Font> font_fallback(bool monospace, bool bold) const;
mutable RefPtr<Gfx::Font> m_font;
};