RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:07:34 +00:00
Code Issues Activity Actions

LibWeb: Use fractions to calculate font absolute size mappings

Browse source 
This also brings us closer to spec by changing the fractional scaling
to use division instead of hard-coded decimal numbers.
This commit is contained in:
Zaggy1024 2023-09-01 15:10:38 -05:00 • committed by Alexander Kalenik
parent c9849aeadd
commit 0e78037c68
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1941,30 +1941,30 @@ RefPtr<Gfx::Font const> StyleComputer::compute_font_for_style_values(DOM::Elemen
if (font_size.is_identifier()) { if (font_size.is_identifier()) {
// https://w3c.github.io/csswg-drafts/css-fonts/#absolute-size-mapping // https://w3c.github.io/csswg-drafts/css-fonts/#absolute-size-mapping
constexpr auto get_absolute_size_mapping = [](Web::CSS::ValueID identifier) { auto get_absolute_size_mapping = [](Web::CSS::ValueID identifier) -> CSSPixelFraction {
switch (identifier) { switch (identifier) {
case CSS::ValueID::XxSmall: case CSS::ValueID::XxSmall:
return 0.6f; return CSSPixels(3) / 5;
case CSS::ValueID::XSmall: case CSS::ValueID::XSmall:
return 0.75f; return CSSPixels(3) / 4;
case CSS::ValueID::Small: case CSS::ValueID::Small:
return 8.0f / 9.0f; return CSSPixels(8) / 9;
case CSS::ValueID::Medium: case CSS::ValueID::Medium:
return 1.0f; return 1;
case CSS::ValueID::Large: case CSS::ValueID::Large:
return 1.2f; return CSSPixels(6) / 5;
case CSS::ValueID::XLarge: case CSS::ValueID::XLarge:
return 1.5f; return CSSPixels(3) / 2;
case CSS::ValueID::XxLarge: case CSS::ValueID::XxLarge:
return 2.0f; return 2;
case CSS::ValueID::XxxLarge: case CSS::ValueID::XxxLarge:
return 3.0f; return 3;
case CSS::ValueID::Smaller: case CSS::ValueID::Smaller:
return 0.8f; return CSSPixels(4) / 5;
case CSS::ValueID::Larger: case CSS::ValueID::Larger:
return 1.25f; return CSSPixels(5) / 4;
default: default:
return 1.0f; return 1;
} }
}; };
@ -1979,8 +1979,7 @@ RefPtr<Gfx::Font const> StyleComputer::compute_font_for_style_values(DOM::Elemen
font_size_in_px = CSSPixels::nearest_value_for(parent_element->computed_css_values()->computed_font().pixel_metrics().size); font_size_in_px = CSSPixels::nearest_value_for(parent_element->computed_css_values()->computed_font().pixel_metrics().size);
} }
} }
font_size_in_px.scale_by(get_absolute_size_mapping(identifier)); font_size_in_px *= get_absolute_size_mapping(identifier);
} else { } else {
Length::ResolutionContext const length_resolution_context { Length::ResolutionContext const length_resolution_context {
.viewport_rect = viewport_rect(), .viewport_rect = viewport_rect(),