RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 06:28:13 +00:00
Code Issues Activity Actions

LibWeb: Remove borders from TemporaryTrack in GFC

Browse source 
This change makes grid items be responsible for their borders instead
of grid tracks which can not have borders itself.

There are changes in layout tests but those are improvements :)
This commit is contained in:
Aliaksandr Kalenik 2023-05-17 08:34:48 +03:00 • committed by Andreas Kling
parent 083e61c36b
commit d6d097b671
5 changed files with 58 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,10 @@ public:
, m_column(column)
, m_column_span(column_span)
{
m_border_top = box.computed_values().border_top().width;
m_border_right = box.computed_values().border_right().width;
m_border_bottom = box.computed_values().border_bottom().width;
m_border_left = box.computed_values().border_left().width;
}
Box const& box() const { return m_box; }
@ -57,6 +61,15 @@ public:
return dimension == GridDimension::Column ? m_column : m_row;
}
CSSPixels add_border_box_sizes(CSSPixels content_size, GridDimension dimension) const
{
if (dimension == GridDimension::Column) {
return m_border_left + content_size + m_border_right;
} else {
return m_border_top + content_size + m_border_bottom;
}
}
size_t raw_row() const { return m_row; }
size_t raw_column() const { return m_column; }
@ -72,6 +85,11 @@ private:
size_t m_row_span { 1 };
size_t m_column { 0 };
size_t m_column_span { 1 };
CSSPixels m_border_top;
CSSPixels m_border_right;
CSSPixels m_border_bottom;
CSSPixels m_border_left;
};
class GridFormattingContext final : public FormattingContext {
@ -103,21 +121,6 @@ private:
bool frozen { false };
bool is_gap { false };
CSSPixels border_left { 0 };
CSSPixels border_right { 0 };
CSSPixels border_top { 0 };
CSSPixels border_bottom { 0 };
CSSPixels full_horizontal_size() const
{
return base_size + border_left + border_right;
}
CSSPixels full_vertical_size() const
{
return base_size + border_top + border_bottom;
}
TemporaryTrack(CSS::GridSize min_track_sizing_function, CSS::GridSize max_track_sizing_function)
: min_track_sizing_function(min_track_sizing_function)
, max_track_sizing_function(max_track_sizing_function)