diff options
| author | Jorge Arellano Cid <jcid@dillo.org> | 2010-10-21 11:22:29 -0300 |
|---|---|---|
| committer | Jorge Arellano Cid <jcid@dillo.org> | 2010-10-21 11:22:29 -0300 |
| commit | 4bc80c00e134f96f7226f64eaa37d5c1097d00b2 (patch) | |
| tree | f9f85a9eb4bcaf69dcf8fdb0f35e887ee4cc293b /src | |
| parent | 90531a3492332a841770ffe32257c97f5531dc0d (diff) | |
imported patch border-collapse-parsing
Diffstat (limited to 'src')
| -rw-r--r-- | src/cssparser.cc | 7 | ||||
| -rw-r--r-- | src/styleengine.cc | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/cssparser.cc b/src/cssparser.cc index 23085352..e9de3aaf 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -47,6 +47,10 @@ typedef struct { const char *const *enum_symbols; } CssPropertyInfo; +static const char *const Css_border_collapse_enum_vals[] = { + "separate", "collapse", NULL +}; + static const char *const Css_border_style_enum_vals[] = { "none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset", NULL @@ -137,7 +141,8 @@ const CssPropertyInfo Css_property_info[CSS_PROPERTY_LAST] = { Css_border_style_enum_vals}, {"border-bottom-width", {CSS_TYPE_ENUM, CSS_TYPE_LENGTH, CSS_TYPE_UNUSED}, Css_border_width_enum_vals}, - {"border-collapse", {CSS_TYPE_UNUSED}, NULL}, + {"border-collapse", {CSS_TYPE_ENUM, CSS_TYPE_UNUSED}, + Css_border_collapse_enum_vals}, {"border-left-color", {CSS_TYPE_COLOR, CSS_TYPE_UNUSED}, NULL}, {"border-left-style", {CSS_TYPE_ENUM, CSS_TYPE_UNUSED}, Css_border_style_enum_vals}, diff --git a/src/styleengine.cc b/src/styleengine.cc index 62ba60d7..a381b1c6 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -434,6 +434,9 @@ void StyleEngine::apply (int i, StyleAttrs *attrs, CssPropertyList *props) { //attrs->backgroundColor = Color::create(layout, 0xdcd1ba); attrs->backgroundColor = Color::create(layout, 0xe0e0a3); break; + case CSS_PROPERTY_BORDER_COLLAPSE: + attrs->borderCollapse = (BorderCollapse) p->value.intVal; + break; case CSS_PROPERTY_BORDER_TOP_COLOR: attrs->borderColor.top = Color::create (layout, p->value.intVal); |