system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 16:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Remove resolve_size method in GFC

Browse source 
Duplicate of CSS::Size::resolved().
This commit is contained in:
Aliaksandr Kalenik 2023-05-06 06:16:20 +03:00 committed by Andreas Kling
parent 3d05ed6b53
commit d6ee4e7fdc
2 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Userland/Libraries/LibWeb/Layout/GridFormattingContext.cpp
View file

@ -45,27 +45,6 @@ size_t GridFormattingContext::count_of_gap_tracks(Vector<TemporaryTrack> const&
return count;
}
CSSPixels GridFormattingContext::resolve_size(CSS::Size const& size, AvailableSize const& available_size)
{
if (size.is_calculated()) {
if (size.calculated().contains_percentage()) {
if (!available_size.is_definite())
return 0;
return size.calculated().resolve_length_percentage(grid_container(), CSS::Length::make_px(available_size.to_px())).value_or(CSS::Length::make_auto()).to_px(grid_container());
}
return size.calculated().resolve_length(grid_container())->to_px(grid_container());
}
if (size.is_length()) {
return size.length().to_px(grid_container());
}
if (size.is_percentage()) {
if (!available_size.is_definite())
return 0;
return available_size.to_px() * size.percentage().as_fraction();
}
return 0;
}
int GridFormattingContext::get_count_of_tracks(Vector<CSS::ExplicitGridTrack> const& track_list, AvailableSpace const& available_space)
{
auto track_count = 0;
@ -633,12 +612,16 @@ void GridFormattingContext::initialize_grid_tracks(AvailableSpace const& availab
// the specified size, which is spanned by any grid items that span across its corresponding grid
// line.
if (!grid_container().computed_values().column_gap().is_auto()) {
for (int column_index = 1; column_index < (m_occupation_grid.column_count() * 2) - 1; column_index += 2)
m_grid_columns.insert(column_index, TemporaryTrack(resolve_size(grid_container().computed_values().column_gap(), available_space.width), true));
for (int column_index = 1; column_index < (m_occupation_grid.column_count() * 2) - 1; column_index += 2) {
auto column_gap_width = grid_container().computed_values().column_gap().resolved(grid_container(), CSS::Length::make_px(available_space.width.to_px()));
m_grid_columns.insert(column_index, TemporaryTrack(column_gap_width.to_px(grid_container()), true));
}
}
if (!grid_container().computed_values().row_gap().is_auto()) {
for (int row_index = 1; row_index < (m_occupation_grid.row_count() * 2) - 1; row_index += 2)
m_grid_rows.insert(row_index, TemporaryTrack(resolve_size(grid_container().computed_values().row_gap(), available_space.height), true));
for (int row_index = 1; row_index < (m_occupation_grid.row_count() * 2) - 1; row_index += 2) {
auto column_gap_height = grid_container().computed_values().row_gap().resolved(grid_container(), CSS::Length::make_px(available_space.height.to_px()));
m_grid_rows.insert(row_index, TemporaryTrack(column_gap_height.to_px(grid_container()), true));
}
}
}

1
Userland/Libraries/LibWeb/Layout/GridFormattingContext.h
View file

@ -150,7 +150,6 @@ private:
int get_line_index_by_line_name(String const& line_name, CSS::GridTrackSizeList);
CSSPixels resolve_definite_track_size(CSS::GridSize const&, AvailableSpace const&);
size_t count_of_gap_tracks(Vector<TemporaryTrack> const& tracks) const;
CSSPixels resolve_size(CSS::Size const&, AvailableSize const&);
int count_of_repeated_auto_fill_or_fit_tracks(Vector<CSS::ExplicitGridTrack> const& track_list, AvailableSpace const&);
int get_count_of_tracks(Vector<CSS::ExplicitGridTrack> const&, AvailableSpace const&);