diff options
Diffstat (limited to 'src/css')
| -rw-r--r-- | src/css/cascade.nim | 28 | ||||
| -rw-r--r-- | src/css/values.nim | 41 |
2 files changed, 51 insertions, 18 deletions
diff --git a/src/css/cascade.nim b/src/css/cascade.nim index 8ce999e0..223a3ec5 100644 --- a/src/css/cascade.nim +++ b/src/css/cascade.nim @@ -27,14 +27,13 @@ proc applyProperty(elem: Element, d: CSSDeclaration, pseudo: PseudoElem) = case pseudo of PSEUDO_NONE: - elem.rendered = not elem.css.applyValue(parent, d) + elem.css.applyValue(parent, d) of PSEUDO_BEFORE, PSEUDO_AFTER: if elem.pseudo[pseudo] == nil: elem.pseudo[pseudo] = elem.css.inheritProperties() - elem.rendered = not elem.pseudo[pseudo].applyValue(parent, d) + elem.pseudo[pseudo].applyValue(parent, d) elem.cssapplied = true - elem.rendered = false func applies(mq: MediaQuery): bool = case mq.t @@ -108,6 +107,23 @@ proc applyImportant(ares: var ApplyResult, decls: seq[CSSDeclaration]) = if decl.important: ares.important.add(decl) +proc checkRendered(element: Element, prev: CSSSpecifiedValues, ppseudo: array[PSEUDO_BEFORE..PSEUDO_AFTER, CSSSpecifiedValues]) = + if element.rendered: + for p in PSEUDO_BEFORE..PSEUDO_AFTER: + if ppseudo[p] != element.pseudo[p] and ppseudo[p] == nil: + element.rendered = false + return + for t in CSSPropertyType: + if not element.css[t].equals(prev[t]): + element.rendered = false + return + for p in PSEUDO_BEFORE..PSEUDO_AFTER: + if ppseudo[p] != nil: + for t in CSSPropertyType: + if not element.pseudo[p][t].equals(ppseudo[p][t]): + element.rendered = false + return + proc applyRules(element: Element, ua, user, author: RuleList, pseudo: PseudoElem) = var ares: ApplyResult @@ -175,11 +191,13 @@ proc applyRules*(document: Document, ua, user: CSSStylesheet) = embedded_rules.add(rules_local) if not elem.cssapplied: + let prev = elem.css + let ppseudo = elem.pseudo if elem.parentElement != nil: elem.css = elem.parentElement.css.inheritProperties() else: elem.css = rootProperties() - for pseudo in [PSEUDO_BEFORE, PSEUDO_AFTER]: + for pseudo in PSEUDO_BEFORE..PSEUDO_AFTER: elem.pseudo[pseudo] = nil let uarules = calcRules(elem, ua) @@ -190,6 +208,8 @@ proc applyRules*(document: Document, ua, user: CSSStylesheet) = for pseudo in PseudoElem: elem.applyRules(uarules, userrules, authorrules, pseudo) + elem.checkRendered(prev, ppseudo) + for i in countdown(elem.children.high, 0): stack.add(elem.children[i]) diff --git a/src/css/values.nim b/src/css/values.nim index 7da9a248..638dc2be 100644 --- a/src/css/values.nim +++ b/src/css/values.nim @@ -691,7 +691,26 @@ func getSpecifiedValue(d: CSSDeclaration, parent: CSSSpecifiedValues): tuple[a:C return (val, cssGlobal(d)) -proc applyValue(vals, parent: CSSSpecifiedValues, t: CSSPropertyType, val: CSSSpecifiedValue, global: CSSGlobalValueType): bool = +func equals*(a, b: CSSSpecifiedValue): bool = + if a == b: + return true + if a == nil or b == nil: + return false + case valueType(a.t) + of VALUE_COLOR: return a.color == b.color + of VALUE_LENGTH: return a.length == b.length + of VALUE_FONT_STYLE: return a.fontstyle == b.fontstyle + of VALUE_DISPLAY: return a.display == b.display + of VALUE_CONTENT: return a.content == b.content + of VALUE_WHITESPACE: return a.whitespace == b.whitespace + of VALUE_INTEGER: return a.integer == a.integer + of VALUE_TEXT_DECORATION: return a.textdecoration == b.textdecoration + of VALUE_WORD_BREAK: return a.wordbreak == b.wordbreak + of VALUE_LIST_STYLE_TYPE: return a.liststyletype == b.liststyletype + of VALUE_NONE: return true + return false + +proc applyValue(vals, parent: CSSSpecifiedValues, t: CSSPropertyType, val: CSSSpecifiedValue, global: CSSGlobalValueType) = let oval = vals[t] case global of VALUE_INHERIT, VALUE_UNSET: @@ -705,16 +724,8 @@ proc applyValue(vals, parent: CSSSpecifiedValues, t: CSSPropertyType, val: CSSSp vals[t] = getDefault(t) #TODO of VALUE_NOGLOBAL: vals[t] = val - return oval != vals[t] -proc applyShorthand(vals, parent: CSSSpecifiedValues, left, right, top, bottom: CSSSpecifiedValue, global: CSSGlobalValueType): bool = - result = result or vals.applyValue(parent, left.t, left, global) - result = result or vals.applyValue(parent, right.t, right, global) - result = result or vals.applyValue(parent, top.t, top, global) - result = result or vals.applyValue(parent, bottom.t, bottom, global) - -# Returns true if anything has changed. (TODO: not always...) -proc applyValue*(vals, parent: CSSSpecifiedValues, d: CSSDeclaration): bool = +proc applyValue*(vals, parent: CSSSpecifiedValues, d: CSSDeclaration) = let vv = getSpecifiedValue(d, parent) let val = vv.a let oval = vals[val.t] @@ -723,21 +734,23 @@ proc applyValue*(vals, parent: CSSSpecifiedValues, d: CSSDeclaration): bool = let global = cssGlobal(d) if global != VALUE_NOGLOBAL: for t in CSSPropertyType: - result = result or vals.applyValue(parent, t, nil, global) + vals.applyValue(parent, t, nil, global) of PROPERTY_MARGIN: let left = CSSSpecifiedValue(t: PROPERTY_MARGIN_LEFT, v: VALUE_LENGTH, length: val.length) let right = CSSSpecifiedValue(t: PROPERTY_MARGIN_RIGHT, v: VALUE_LENGTH, length: val.length) let top = CSSSpecifiedValue(t: PROPERTY_MARGIN_TOP, v: VALUE_LENGTH, length: val.length) let bottom = CSSSpecifiedValue(t: PROPERTY_MARGIN_BOTTOM, v: VALUE_LENGTH, length: val.length) - return vals.applyShorthand(parent, left, right, top, bottom, vv.b) + for val in [left, right, top, bottom]: + vals.applyValue(parent, val.t, val, vv.b) of PROPERTY_PADDING: let left = CSSSpecifiedValue(t: PROPERTY_PADDING_LEFT, v: VALUE_LENGTH, length: val.length) let right = CSSSpecifiedValue(t: PROPERTY_PADDING_RIGHT, v: VALUE_LENGTH, length: val.length) let top = CSSSpecifiedValue(t: PROPERTY_PADDING_TOP, v: VALUE_LENGTH, length: val.length) let bottom = CSSSpecifiedValue(t: PROPERTY_PADDING_BOTTOM, v: VALUE_LENGTH, length: val.length) - return vals.applyShorthand(parent, left, right, top, bottom, vv.b) + for val in [left, right, top, bottom]: + vals.applyValue(parent, val.t, val, vv.b) else: - return vals.applyValue(parent, val.t, vv.a, vv.b) + vals.applyValue(parent, val.t, vv.a, vv.b) func inheritProperties*(parent: CSSSpecifiedValues): CSSSpecifiedValues = new(result) |