mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-23 04:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb: Move minimum/maximum size getter into GridItem method in GFC

Browse source 
No behavior change intended.
This commit is contained in:
Aliaksandr Kalenik 2025-03-20 18:50:45 +01:00
parent 01031bcccb
commit 3a1efc8431
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Libraries/LibWeb/Layout/GridFormattingContext.cpp
View file

@ -2410,20 +2410,6 @@ AvailableSpace GridFormattingContext::get_available_space_for_item(GridItem cons
return AvailableSpace(available_width, available_height);
}
static CSS::Size const& get_item_minimum_size(GridItem const& item, GridDimension const dimension)
{
if (dimension == GridDimension::Column)
return item.box->computed_values().min_width();
return item.box->computed_values().min_height();
}
static CSS::Size const& get_item_maximum_size(GridItem const& item, GridDimension const dimension)
{
if (dimension == GridDimension::Column)
return item.box->computed_values().max_width();
return item.box->computed_values().max_height();
}
CSSPixels GridFormattingContext::calculate_min_content_contribution(GridItem const& item, GridDimension const dimension) const
{
auto available_space_for_item = get_available_space_for_item(item);
@ -2435,7 +2421,7 @@ CSSPixels GridFormattingContext::calculate_min_content_contribution(GridItem con
}();
auto maxium_size = CSSPixels::max();
if (auto const& css_maximum_size = get_item_maximum_size(item, dimension); css_maximum_size.is_length()) {
if (auto const& css_maximum_size = item.maximum_size(dimension); css_maximum_size.is_length()) {
maxium_size = css_maximum_size.length().to_px(item.box);
}
@ -2464,7 +2450,7 @@ CSSPixels GridFormattingContext::calculate_max_content_contribution(GridItem con
}();
auto maxium_size = CSSPixels::max();
if (auto const& css_maximum_size = get_item_maximum_size(item, dimension); css_maximum_size.is_length()) {
if (auto const& css_maximum_size = item.maximum_size(dimension); css_maximum_size.is_length()) {
maxium_size = css_maximum_size.length().to_px(item.box);
}
@ -2618,7 +2604,7 @@ CSSPixels GridFormattingContext::content_based_minimum_size(GridItem const& item
}
// In all cases, the size suggestion is additionally clamped by the maximum size in the affected axis, if it’s definite.
if (auto const& css_maximum_size = get_item_maximum_size(item, dimension); css_maximum_size.is_length()) {
if (auto const& css_maximum_size = item.maximum_size(dimension); css_maximum_size.is_length()) {
auto maximum_size = css_maximum_size.length().to_px(item.box);
result = min(result, maximum_size);
}
@ -2673,7 +2659,7 @@ CSSPixels GridFormattingContext::calculate_minimum_contribution(GridItem const&
}();
if (should_treat_preferred_size_as_auto) {
auto minimum_size = get_item_minimum_size(item, dimension);
auto minimum_size = item.minimum_size(dimension);
if (minimum_size.is_auto())
return item.add_margin_box_sizes(automatic_minimum_size(item, dimension), dimension);
auto containing_block_size = containing_block_size_for_item(item, dimension);

15
Libraries/LibWeb/Layout/GridFormattingContext.h
View file

@ -68,6 +68,21 @@ struct GridItem {
[[nodiscard]] int gap_adjusted_row() const;
[[nodiscard]] int gap_adjusted_column() const;
CSS::ComputedValues const& computed_values() const
{
return box->computed_values();
}
CSS::Size const& minimum_size(GridDimension dimension) const
{
return dimension == GridDimension::Column ? computed_values().min_width() : computed_values().min_height();
}
CSS::Size const& maximum_size(GridDimension dimension) const
{
return dimension == GridDimension::Column ? computed_values().max_width() : computed_values().max_height();
}
};
enum class FoundUnoccupiedPlace {