diff --git a/Userland/Libraries/LibGfx/BitmapFont.cpp b/Userland/Libraries/LibGfx/BitmapFont.cpp index 6907bb661a..155b22de28 100644 --- a/Userland/Libraries/LibGfx/BitmapFont.cpp +++ b/Userland/Libraries/LibGfx/BitmapFont.cpp @@ -372,12 +372,12 @@ Font const& Font::bold_variant() const return *m_bold_variant; } -FontMetrics Font::metrics(u32 code_point) const +FontMetrics Font::metrics() const { return FontMetrics { .size = (float)presentation_size(), .x_height = (float)x_height(), - .glyph_width = (float)glyph_width(code_point), + .glyph_width = (float)glyph_width('M'), .glyph_spacing = (float)glyph_spacing(), }; } diff --git a/Userland/Libraries/LibGfx/Font.h b/Userland/Libraries/LibGfx/Font.h index 256623b907..139ff23218 100644 --- a/Userland/Libraries/LibGfx/Font.h +++ b/Userland/Libraries/LibGfx/Font.h @@ -103,7 +103,7 @@ public: virtual NonnullRefPtr clone() const = 0; virtual ~Font() {}; - FontMetrics metrics(u32 code_point) const; + FontMetrics metrics() const; virtual u8 presentation_size() const = 0; virtual int pixel_size() const = 0; diff --git a/Userland/Libraries/LibWeb/CSS/Length.cpp b/Userland/Libraries/LibWeb/CSS/Length.cpp index 349fed3d2a..a350a59fbd 100644 --- a/Userland/Libraries/LibWeb/CSS/Length.cpp +++ b/Userland/Libraries/LibWeb/CSS/Length.cpp @@ -106,7 +106,7 @@ float Length::to_px(Layout::Node const& layout_node) const auto* root_element = layout_node.document().document_element(); if (!root_element || !root_element->layout_node()) return 0; - return to_px(viewport_rect, layout_node.font().metrics('M'), layout_node.computed_values().font_size(), root_element->layout_node()->computed_values().font_size()); + return to_px(viewport_rect, layout_node.font().metrics(), layout_node.computed_values().font_size(), root_element->layout_node()->computed_values().font_size()); } String Length::to_string() const diff --git a/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp b/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp index c232236270..f004d57b19 100644 --- a/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp +++ b/Userland/Libraries/LibWeb/CSS/MediaQuery.cpp @@ -166,7 +166,7 @@ bool MediaFeature::compare(HTML::Window const& window, MediaFeatureValue left, C Gfx::IntRect viewport_rect { 0, 0, window.inner_width(), window.inner_height() }; auto const& initial_font = window.associated_document().style_computer().initial_font(); - Gfx::FontMetrics const& initial_font_metrics = initial_font.metrics('M'); + Gfx::FontMetrics const& initial_font_metrics = initial_font.metrics(); float initial_font_size = initial_font.presentation_size(); left_px = left.length().to_px(viewport_rect, initial_font_metrics, initial_font_size, initial_font_size); diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp index ce1dc4752d..7728f611d7 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -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 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) 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);