0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

LibWeb: Unify code for assigning vertical box model metrics in BFC

Browse source 
We were doing the exact same thing for both replaced and non-replaced
elements, so let's share the code. :^)
This commit is contained in:
Andreas Kling 2022-01-24 01:23:02 +01:00
parent 00bd17034d
commit d58f60c953
Notes: sideshowbarker 2024-07-17 20:20:56 +09:00
2 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Userland/Libraries/LibWeb/Layout/BlockFormattingContext.cpp
View file

@ -434,33 +434,10 @@ void BlockFormattingContext::layout_block_level_children(BlockContainer& block_c
}
}
void BlockFormattingContext::place_block_level_replaced_element_in_normal_flow(Box& child_box, BlockContainer const& containing_block)
{
VERIFY(!containing_block.is_absolutely_positioned());
auto& replaced_element_box_model = child_box.box_model();
auto width_of_containing_block = CSS::Length::make_px(containing_block.width());
replaced_element_box_model.margin.top = child_box.computed_values().margin().top.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
replaced_element_box_model.margin.bottom = child_box.computed_values().margin().bottom.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
replaced_element_box_model.border.top = child_box.computed_values().border_top().width;
replaced_element_box_model.border.bottom = child_box.computed_values().border_bottom().width;
replaced_element_box_model.padding.top = child_box.computed_values().padding().top.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
replaced_element_box_model.padding.bottom = child_box.computed_values().padding().bottom.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
float x = replaced_element_box_model.margin.left
+ replaced_element_box_model.border.left
+ replaced_element_box_model.padding.left
+ replaced_element_box_model.offset.left;
float y = replaced_element_box_model.margin_box().top + containing_block.box_model().offset.top;
child_box.set_offset(x, y);
}
void BlockFormattingContext::place_block_level_non_replaced_element_in_normal_flow(Box& child_box, BlockContainer const& containing_block)
void BlockFormattingContext::compute_vertical_box_model_metrics(Box& child_box, BlockContainer const& containing_block)
{
auto& box_model = child_box.box_model();
auto& computed_values = child_box.computed_values();
auto const& computed_values = child_box.computed_values();
auto width_of_containing_block = CSS::Length::make_px(containing_block.width());
box_model.margin.top = computed_values.margin().top.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
@ -469,6 +446,31 @@ void BlockFormattingContext::place_block_level_non_replaced_element_in_normal_fl
box_model.border.bottom = computed_values.border_bottom().width;
box_model.padding.top = computed_values.padding().top.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
box_model.padding.bottom = computed_values.padding().bottom.resolved(width_of_containing_block).resolved_or_zero(containing_block).to_px(child_box);
}
void BlockFormattingContext::place_block_level_replaced_element_in_normal_flow(Box& child_box, BlockContainer const& containing_block)
{
VERIFY(!containing_block.is_absolutely_positioned());
auto& box_model = child_box.box_model();
compute_vertical_box_model_metrics(child_box, containing_block);
float x = box_model.margin.left
+ box_model.border.left
+ box_model.padding.left
+ box_model.offset.left;
float y = box_model.margin_box().top + containing_block.box_model().offset.top;
child_box.set_offset(x, y);
}
void BlockFormattingContext::place_block_level_non_replaced_element_in_normal_flow(Box& child_box, BlockContainer const& containing_block)
{
auto& box_model = child_box.box_model();
auto const& computed_values = child_box.computed_values();
compute_vertical_box_model_metrics(child_box, containing_block);
float x = box_model.margin.left
+ box_model.border.left

2
Userland/Libraries/LibWeb/Layout/BlockFormattingContext.h
View file

@ -49,6 +49,8 @@ private:
void layout_block_level_children(BlockContainer&, LayoutMode);
void layout_inline_children(BlockContainer&, LayoutMode);
void compute_vertical_box_model_metrics(Box& child_box, BlockContainer const& containing_block);
void place_block_level_replaced_element_in_normal_flow(Box& child, BlockContainer const&);
void place_block_level_non_replaced_element_in_normal_flow(Box& float_side, BlockContainer const&);