eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-26 01:35:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Respect box-sizing value when getting width/height used value

Browse Source
This commit is contained in:
Tim Ledbetter
2026-03-10 23:38:42 +00:00
committed by Jelle Raaijmakers
parent 9d2ebe90ed
commit 8179efb38e
Notes: github-actions[bot] 2026-03-11 10:34:35 +00:00 
Author: https://github.com/tcl3
Commit: https://github.com/LadybirdBrowser/ladybird/commit/8179efb38e2
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/8358
Reviewed-by: https://github.com/gmta ✅
3 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Libraries/LibWeb/CSS/CSSStyleProperties.cpp
View File

@@ -645,6 +645,14 @@ RefPtr<StyleValue const> CSSStyleProperties::style_value_for_computed_property(L
return {};
};
auto used_size_for_property = [&layout_node, &used_value_for_property]<typename ContentBoxGetter, typename BorderBoxGetter>(ContentBoxGetter content_box_getter, BorderBoxGetter border_box_getter) -> Optional<CSSPixels> {
return used_value_for_property([&layout_node, content_box_getter, border_box_getter](Painting::PaintableBox const& paintable_box) {
if (layout_node.computed_values().box_sizing() == BoxSizing::BorderBox)
return border_box_getter(paintable_box);
return content_box_getter(paintable_box);
});
};
auto& element = owner_node()->element();
auto pseudo_element = owner_node()->pseudo_element();
@@ -753,7 +761,9 @@ RefPtr<StyleValue const> CSSStyleProperties::style_value_for_computed_property(L
// display property is not none or contents, then the resolved value is the used value.
// Otherwise the resolved value is the computed value.
case PropertyID::Height: {
auto maybe_used_height = used_value_for_property([](auto const& paintable_box) { return paintable_box.content_height(); });
auto maybe_used_height = used_size_for_property(
[](auto const& paintable_box) { return paintable_box.content_height(); },
[](auto const& paintable_box) { return paintable_box.absolute_border_box_rect().height(); });
if (maybe_used_height.has_value())
return style_value_for_size(Size::make_px(maybe_used_height.release_value()));
return style_value_for_size(layout_node.computed_values().height());
@@ -791,7 +801,9 @@ RefPtr<StyleValue const> CSSStyleProperties::style_value_for_computed_property(L
return LengthStyleValue::create(Length::make_px(maybe_used_value.release_value()));
return style_value_for_length_percentage_or_auto(layout_node.computed_values().padding().top());
case PropertyID::Width: {
auto maybe_used_width = used_value_for_property([](auto const& paintable_box) { return paintable_box.content_width(); });
auto maybe_used_width = used_size_for_property(
[](auto const& paintable_box) { return paintable_box.content_width(); },
[](auto const& paintable_box) { return paintable_box.absolute_border_box_rect().width(); });
if (maybe_used_width.has_value())
return style_value_for_size(Size::make_px(maybe_used_width.release_value()));
return style_value_for_size(layout_node.computed_values().width());