aboutsummaryrefslogtreecommitdiff
path: root/dw
diff options
context:
space:
mode:
Diffstat (limited to 'dw')
-rw-r--r--dw/style.cc4
-rw-r--r--dw/style.hh1
2 files changed, 5 insertions, 0 deletions
diff --git a/dw/style.cc b/dw/style.cc
index d315382c..b876985b 100644
--- a/dw/style.cc
+++ b/dw/style.cc
@@ -50,6 +50,7 @@ void StyleAttrs::initValues ()
borderWidth.setVal (0);
padding.setVal (0);
borderCollapse = BORDER_MODEL_SEPARATE;
+ collapseStyleSet = false;
setBorderColor (NULL);
setBorderStyle (BORDER_NONE);
hBorderSpacing = 0;
@@ -125,6 +126,7 @@ bool StyleAttrs::equals (object::Object *other) {
borderWidth.equals (&otherAttrs->borderWidth) &&
padding.equals (&otherAttrs->padding) &&
borderCollapse == otherAttrs->borderCollapse &&
+ collapseStyleSet == otherAttrs->collapseStyleSet &&
borderColor.top == otherAttrs->borderColor.top &&
borderColor.right == otherAttrs->borderColor.right &&
borderColor.bottom == otherAttrs->borderColor.bottom &&
@@ -161,6 +163,7 @@ int StyleAttrs::hashValue () {
borderWidth.hashValue () +
padding.hashValue () +
borderCollapse +
+ collapseStyleSet +
(intptr_t) borderColor.top +
(intptr_t) borderColor.right +
(intptr_t) borderColor.bottom +
@@ -250,6 +253,7 @@ void Style::copyAttrs (StyleAttrs *attrs)
borderWidth = attrs->borderWidth;
padding = attrs->padding;
borderCollapse = attrs->borderCollapse;
+ collapseStyleSet = attrs->collapseStyleSet;
borderColor = attrs->borderColor;
borderStyle = attrs->borderStyle;
display = attrs->display;
diff --git a/dw/style.hh b/dw/style.hh
index 0fbd2a84..7a401e7f 100644
--- a/dw/style.hh
+++ b/dw/style.hh
@@ -441,6 +441,7 @@ public:
Box margin, borderWidth, padding;
BorderCollapse borderCollapse;
+ bool collapseStyleSet;
struct { Color *top, *right, *bottom, *left; } borderColor;
struct { BorderStyle top, right, bottom, left; } borderStyle;