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

LibWeb: Move border width and color into LayoutStyle

Browse source 
To make this possible, I also had to give each LayoutNode a Document&
so it can resolve document-specific colors correctly. There's probably
ways to avoid having this extra member by resolving colors later, but
this works for now.
This commit is contained in:
Andreas Kling 2020-06-24 19:41:12 +02:00
parent 4b2ac34725
commit 440b4ece22
57 changed files with 173 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Libraries/LibWeb/Layout/LayoutStyle.h
View file

@ -37,6 +37,12 @@ public:
static CSS::WhiteSpace white_space() { return CSS::WhiteSpace::Normal; }
};
struct BorderData {
public:
Color color { Color::Transparent };
float width { 0 };
};
class LayoutStyle {
public:
Optional<int> z_index() const { return m_z_index; }
@ -54,6 +60,11 @@ public:
const LengthBox& margin() const { return m_margin; }
const LengthBox& padding() const { return m_padding; }
const BorderData& border_left() const { return m_border_left; }
const BorderData& border_top() const { return m_border_top; }
const BorderData& border_right() const { return m_border_right; }
const BorderData& border_bottom() const { return m_border_bottom; }
protected:
Optional<int> m_z_index;
CSS::TextAlign m_text_align;
@ -68,6 +79,10 @@ protected:
LengthBox m_offset;
LengthBox m_margin;
LengthBox m_padding;
BorderData m_border_left;
BorderData m_border_top;
BorderData m_border_right;
BorderData m_border_bottom;
};
class ImmutableLayoutStyle final : public LayoutStyle {
@ -88,6 +103,10 @@ public:
void set_offset(const LengthBox& offset) { m_offset = offset; }
void set_margin(const LengthBox& margin) { m_margin = margin; }
void set_padding(const LengthBox& padding) { m_padding = padding; }
BorderData& border_left() { return m_border_left; }
BorderData& border_top() { return m_border_top; }
BorderData& border_right() { return m_border_right; }
BorderData& border_bottom() { return m_border_bottom; }
};
}