From 47e3daa40f9f40940af80b97236723a0df96c51b Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 8 Oct 2022 13:48:08 +0200 Subject: [PATCH] LibWeb: Use *outside* available space for fit-content sizing in FFC When calculating the fit-content width or height for a flex item, we need to use the available space *outside* the item, not the available space *inside*. --- .../Libraries/LibWeb/Layout/FlexFormattingContext.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp index ad287c77d0..c3da440383 100644 --- a/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp +++ b/Userland/Libraries/LibWeb/Layout/FlexFormattingContext.cpp @@ -1726,14 +1726,14 @@ float FlexFormattingContext::calculate_min_content_main_size(FlexItem const& ite float FlexFormattingContext::calculate_fit_content_main_size(FlexItem const& item) const { - return is_row_layout() ? calculate_fit_content_width(item.box, m_state.get(item.box).available_inner_space_or_constraints_from(m_available_space_for_items->space)) - : calculate_fit_content_height(item.box, m_state.get(item.box).available_inner_space_or_constraints_from(m_available_space_for_items->space)); + return is_row_layout() ? calculate_fit_content_width(item.box, m_available_space_for_items->space) + : calculate_fit_content_height(item.box, m_available_space_for_items->space); } float FlexFormattingContext::calculate_fit_content_cross_size(FlexItem const& item) const { - return !is_row_layout() ? calculate_fit_content_width(item.box, m_state.get(item.box).available_inner_space_or_constraints_from(m_available_space_for_items->space)) - : calculate_fit_content_height(item.box, m_state.get(item.box).available_inner_space_or_constraints_from(m_available_space_for_items->space)); + return !is_row_layout() ? calculate_fit_content_width(item.box, m_available_space_for_items->space) + : calculate_fit_content_height(item.box, m_available_space_for_items->space); } float FlexFormattingContext::calculate_max_content_main_size(FlexItem const& item) const