RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:57:44 +00:00
Code Issues Activity Actions

LibWeb: Take borders and padding into account when doing Flex layout

Browse source 
Before this the flex layout didn't take into account the applied
borders or padding while laying out the items.

The child's top and left borders would get painted over the
parent's borders, also due to it not taking borders into account,
children with borders would overlap each other.

Due to it not taking padding into account, the children would get
drawn outside the parent element.
This commit is contained in:
Enver Balalic 2022-03-27 16:14:18 +02:00 • committed by Andreas Kling
parent 46710d9efa
commit 4ecc695a65
2 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/Layout/FlexFormattingContext.h
View file

@ -37,7 +37,7 @@ private:
float flex_base_size { 0 };
float hypothetical_main_size { 0 };
float hypothetical_cross_size { 0 };
float hypothetical_cross_size_with_margins() { return hypothetical_cross_size + margins.cross_before + margins.cross_after; }
float hypothetical_cross_size_with_margins() { return hypothetical_cross_size + margins.cross_before + margins.cross_after + borders.cross_after + borders.cross_before + padding.cross_after + padding.cross_before; }
float target_main_size { 0 };
bool frozen { false };
Optional<float> flex_factor {};
@ -48,6 +48,8 @@ private:
float main_offset { 0 };
float cross_offset { 0 };
DirectionAgnosticMargins margins {};
DirectionAgnosticMargins borders {};
DirectionAgnosticMargins padding {};
bool is_min_violation { false };
bool is_max_violation { false };
};