diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-06-24 16:11:15 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-06-24 16:49:51 +0200 |
| commit | 5d86305a7247032c026899bf5ada39afd2964a89 (patch) | |
| tree | 8f142c64f70245c65474fdaf6b7c76de1c93430c /Libraries/LibWeb/Layout/LayoutBlock.cpp | |
| parent | ec466c0385c76213579a9418e32182e316f20cc6 (diff) | |
| download | serenity-5d86305a7247032c026899bf5ada39afd2964a89.zip | |
LibWeb: Move height, min-height and max-height into LayoutStyle
Diffstat (limited to 'Libraries/LibWeb/Layout/LayoutBlock.cpp')
| -rw-r--r-- | Libraries/LibWeb/Layout/LayoutBlock.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Libraries/LibWeb/Layout/LayoutBlock.cpp b/Libraries/LibWeb/Layout/LayoutBlock.cpp index c66fe3d356..41890ee32a 100644 --- a/Libraries/LibWeb/Layout/LayoutBlock.cpp +++ b/Libraries/LibWeb/Layout/LayoutBlock.cpp @@ -670,19 +670,19 @@ void LayoutBlock::place_block_level_non_replaced_element_in_normal_flow(LayoutBl void LayoutBlock::compute_height() { - auto& style = this->specified_style(); + auto& specified_style = this->specified_style(); + auto& containing_block = *this->containing_block(); - auto specified_height = style.length_or_fallback(CSS::PropertyID::Height, Length::make_auto(), containing_block()->height()); - auto specified_max_height = style.length_or_fallback(CSS::PropertyID::MaxHeight, Length::make_auto(), containing_block()->height()); + auto specified_height = style().height().resolved_or_auto(*this, containing_block.height()); + auto specified_max_height = style().max_height().resolved_or_auto(*this, containing_block.height()); - auto& containing_block = *this->containing_block(); - box_model().margin.top = style.length_or_fallback(CSS::PropertyID::MarginTop, Length::make_px(0), containing_block.width()); - box_model().margin.bottom = style.length_or_fallback(CSS::PropertyID::MarginBottom, Length::make_px(0), containing_block.width()); - box_model().border.top = style.length_or_fallback(CSS::PropertyID::BorderTopWidth, Length::make_px(0)); - box_model().border.bottom = style.length_or_fallback(CSS::PropertyID::BorderBottomWidth, Length::make_px(0)); - box_model().padding.top = style.length_or_fallback(CSS::PropertyID::PaddingTop, Length::make_px(0), containing_block.width()); - box_model().padding.bottom = style.length_or_fallback(CSS::PropertyID::PaddingBottom, Length::make_px(0), containing_block.width()); + box_model().margin.top = specified_style.length_or_fallback(CSS::PropertyID::MarginTop, Length::make_px(0), containing_block.width()); + box_model().margin.bottom = specified_style.length_or_fallback(CSS::PropertyID::MarginBottom, Length::make_px(0), containing_block.width()); + box_model().border.top = specified_style.length_or_fallback(CSS::PropertyID::BorderTopWidth, Length::make_px(0)); + box_model().border.bottom = specified_style.length_or_fallback(CSS::PropertyID::BorderBottomWidth, Length::make_px(0)); + box_model().padding.top = specified_style.length_or_fallback(CSS::PropertyID::PaddingTop, Length::make_px(0), containing_block.width()); + box_model().padding.bottom = specified_style.length_or_fallback(CSS::PropertyID::PaddingBottom, Length::make_px(0), containing_block.width()); if (!specified_height.is_auto()) { float used_height = specified_height.to_px(*this); |