RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:38:11 +00:00
Code Issues Activity Actions

LibGfx: Remove code point parameter from Gfx::Font::Metrics

Browse source 
Everyone was asking for the glyph width of 'M' anyway. We can just make
that request implicit and simplify the API.
This commit is contained in:
Andreas Kling 2022-03-28 11:57:44 +02:00
parent b0955fd269
commit 2f7b6af87e
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -776,7 +776,7 @@ float StyleComputer::root_element_font_size() const
if (!maybe_root_value.has_value())
return default_root_element_font_size;
return maybe_root_value.value()->to_length().to_px(viewport_rect(), computed_root_style->computed_font().metrics('M'), default_root_element_font_size, default_root_element_font_size);
return maybe_root_value.value()->to_length().to_px(viewport_rect(), computed_root_style->computed_font().metrics(), default_root_element_font_size, default_root_element_font_size);
}
void StyleComputer::compute_font(StyleProperties& style, DOM::Element const* element, Optional<CSS::Selector::PseudoElement> pseudo_element) const
@ -860,9 +860,9 @@ void StyleComputer::compute_font(StyleProperties& style, DOM::Element const* ele
Gfx::FontMetrics font_metrics;
if (parent_element && parent_element->computed_css_values())
font_metrics = parent_element->computed_css_values()->computed_font().metrics('M');
font_metrics = parent_element->computed_css_values()->computed_font().metrics();
else
font_metrics = Gfx::FontDatabase::default_font().metrics('M');
font_metrics = Gfx::FontDatabase::default_font().metrics();
auto parent_font_size = [&]() -> float {
if (!parent_element || !parent_element->computed_css_values())
@ -1003,7 +1003,7 @@ Gfx::Font const& StyleComputer::initial_font() const
void StyleComputer::absolutize_values(StyleProperties& style, DOM::Element const*, Optional<CSS::Selector::PseudoElement>) const
{
auto font_metrics = style.computed_font().metrics('M');
auto font_metrics = style.computed_font().metrics();
float root_font_size = root_element_font_size();
float font_size = style.property(CSS::PropertyID::FontSize).value()->to_length().to_px(viewport_rect(), font_metrics, root_font_size, root_font_size);