RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 18:47:44 +00:00
Code Issues Activity Actions

LibWeb: Use font-derived metrics for "line-height:normal"

Browse source 
Instead of multiplying the font-size with 1.4f because reasons, we now
ask the font for its preferred line spacing.
This commit is contained in:
Andreas Kling 2022-03-29 00:49:05 +02:00
parent 56a284713d
commit dd940dfa85
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,13 +117,11 @@ NonnullRefPtr<Gfx::Font> StyleProperties::font_fallback(bool monospace, bool bol
float StyleProperties::line_height(Layout::Node const& layout_node) const float StyleProperties::line_height(Layout::Node const& layout_node) const
{ {
constexpr float font_height_to_line_height_multiplier = 1.4f;
if (auto maybe_line_height = property(CSS::PropertyID::LineHeight); maybe_line_height.has_value()) { if (auto maybe_line_height = property(CSS::PropertyID::LineHeight); maybe_line_height.has_value()) {
auto line_height = maybe_line_height.release_value(); auto line_height = maybe_line_height.release_value();
if (line_height->is_identifier() && line_height->to_identifier() == ValueID::Normal) if (line_height->is_identifier() && line_height->to_identifier() == ValueID::Normal)
return Length(1, Length::Type::Em).to_px(layout_node) * font_height_to_line_height_multiplier; return layout_node.font().pixel_metrics().line_spacing();
if (line_height->is_length()) { if (line_height->is_length()) {
auto line_height_length = line_height->to_length(); auto line_height_length = line_height->to_length();
@ -141,7 +139,7 @@ float StyleProperties::line_height(Layout::Node const& layout_node) const
} }
} }
return Length(font_height_to_line_height_multiplier, Length::Type::Em).to_px(layout_node); return layout_node.font().pixel_metrics().line_spacing();
} }
Optional<int> StyleProperties::z_index() const Optional<int> StyleProperties::z_index() const