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

LibWeb: Allow LengthPercentage to hold a calculated value

Browse source 
Most of the time, we cannot resolve a `calc()` expression until we go to
use it. Since any `<length-percentage>` can legally be a `calc
()`, let's store it in `LengthPercentage` rather than make every single
user care about this distinction.
This commit is contained in:
Sam Atkins 2022-01-27 14:38:59 +00:00 • committed by Andreas Kling
parent f0fb84dfcb
commit ce0de4b2b4
11 changed files with 145 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/Painting/BackgroundPainting.cpp
View file

@ -88,20 +88,20 @@ void paint_background(PaintContext& context, Layout::NodeWithStyleAndBoxModelMet
width = image.width();
height = image.height();
} else if (x_is_auto) {
height = layer.size_y.resolved(CSS::Length::make_px(background_positioning_area.height()))
height = layer.size_y.resolved(layout_node, CSS::Length::make_px(background_positioning_area.height()))
.resolved_or_zero(layout_node)
.to_px(layout_node);
width = roundf(image.width() * ((float)height / (float)image.height()));
} else if (y_is_auto) {
width = layer.size_x.resolved(CSS::Length::make_px(background_positioning_area.width()))
width = layer.size_x.resolved(layout_node, CSS::Length::make_px(background_positioning_area.width()))
.resolved_or_zero(layout_node)
.to_px(layout_node);
height = roundf(image.height() * ((float)width / (float)image.width()));
} else {
width = layer.size_x.resolved(CSS::Length::make_px(background_positioning_area.width()))
width = layer.size_x.resolved(layout_node, CSS::Length::make_px(background_positioning_area.width()))
.resolved_or_zero(layout_node)
.to_px(layout_node);
height = layer.size_y.resolved(CSS::Length::make_px(background_positioning_area.height()))
height = layer.size_y.resolved(layout_node, CSS::Length::make_px(background_positioning_area.height()))
.resolved_or_zero(layout_node)
.to_px(layout_node);
}
@ -143,7 +143,7 @@ void paint_background(PaintContext& context, Layout::NodeWithStyleAndBoxModelMet
int space_y = background_positioning_area.height() - image_rect.height();
// Position
int offset_x = layer.position_offset_x.resolved(CSS::Length::make_px(space_x))
int offset_x = layer.position_offset_x.resolved(layout_node, CSS::Length::make_px(space_x))
.resolved_or_zero(layout_node)
.to_px(layout_node);
if (layer.position_edge_x == CSS::PositionEdge::Right) {
@ -152,7 +152,7 @@ void paint_background(PaintContext& context, Layout::NodeWithStyleAndBoxModelMet
image_rect.set_left(background_positioning_area.left() + offset_x);
}
int offset_y = layer.position_offset_y.resolved(CSS::Length::make_px(space_y))
int offset_y = layer.position_offset_y.resolved(layout_node, CSS::Length::make_px(space_y))
.resolved_or_zero(layout_node)
.to_px(layout_node);
if (layer.position_edge_y == CSS::PositionEdge::Bottom) {

8
Userland/Libraries/LibWeb/Painting/BorderPainting.cpp
View file

@ -17,10 +17,10 @@ BorderRadiusData normalized_border_radius_data(Layout::Node const& node, Gfx::Fl
// Spec just says "Refer to corresponding dimension of the border box."
// For now, all relative values are relative to the width.
auto width_length = CSS::Length::make_px(rect.width());
auto bottom_left_radius_px = bottom_left_radius.resolved(width_length).resolved_or_zero(node).to_px(node);
auto bottom_right_radius_px = bottom_right_radius.resolved(width_length).resolved_or_zero(node).to_px(node);
auto top_left_radius_px = top_left_radius.resolved(width_length).resolved_or_zero(node).to_px(node);
auto top_right_radius_px = top_right_radius.resolved(width_length).resolved_or_zero(node).to_px(node);
auto bottom_left_radius_px = bottom_left_radius.resolved(node, width_length).resolved_or_zero(node).to_px(node);
auto bottom_right_radius_px = bottom_right_radius.resolved(node, width_length).resolved_or_zero(node).to_px(node);
auto top_left_radius_px = top_left_radius.resolved(node, width_length).resolved_or_zero(node).to_px(node);
auto top_right_radius_px = top_right_radius.resolved(node, width_length).resolved_or_zero(node).to_px(node);
// Scale overlapping curves according to https://www.w3.org/TR/css-backgrounds-3/#corner-overlap
auto f = 1.0f;