diff options
| author | Sebastian Geerken <devnull@localhost> | 2014-10-03 13:51:25 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2014-10-03 13:51:25 +0200 |
| commit | 8fd2ae404f3f0af087217ba79ff9a35955fb026f (patch) | |
| tree | bc42c1fbbb2224a52846d62111e5924ec788d0fc /src | |
| parent | 59b3ae08f3fcd91c0792e2ea840d0072f1d73416 (diff) | |
| parent | 5f1cf298395601f67afc9aff78e547d915663daf (diff) | |
Merge with main repo. (But something is not working yet.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cssparser.cc | 6 | ||||
| -rw-r--r-- | src/styleengine.cc | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/cssparser.cc b/src/cssparser.cc index c400a8e6..57661ff1 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -129,6 +129,10 @@ static const char *const Css_list_style_type_enum_vals[] = { "katakana-iroha", "none", NULL }; +static const char *const Css_overflow_enum_vals[] = { + "visible", "hidden", "scroll", "auto", NULL +}; + static const char *const Css_position_enum_vals[] = { "static", "relative", "absolute", "fixed", NULL }; @@ -250,7 +254,7 @@ const CssPropertyInfo Css_property_info[CSS_PROPERTY_LAST] = { {"outline-color", {CSS_TYPE_UNUSED}, NULL}, {"outline-style", {CSS_TYPE_UNUSED}, NULL}, {"outline-width", {CSS_TYPE_UNUSED}, NULL}, - {"overflow", {CSS_TYPE_UNUSED}, NULL}, + {"overflow", {CSS_TYPE_ENUM, CSS_TYPE_UNUSED}, Css_overflow_enum_vals}, {"padding-bottom", {CSS_TYPE_LENGTH, CSS_TYPE_UNUSED}, NULL}, {"padding-left", {CSS_TYPE_LENGTH, CSS_TYPE_UNUSED}, NULL}, {"padding-right", {CSS_TYPE_LENGTH, CSS_TYPE_UNUSED}, NULL}, diff --git a/src/styleengine.cc b/src/styleengine.cc index 8a90751e..a660b175 100644 --- a/src/styleengine.cc +++ b/src/styleengine.cc @@ -653,6 +653,9 @@ void StyleEngine::apply (int i, StyleAttrs *attrs, CssPropertyList *props, if (attrs->margin.top < 0) // \todo fix negative margins in dw/* attrs->margin.top = 0; break; + case CSS_PROPERTY_OVERFLOW: + attrs->overflow = (Overflow) p->value.intVal; + break; case CSS_PROPERTY_PADDING_TOP: computeValue (&attrs->padding.top, p->value.intVal, attrs->font); break; |