From 30833a1ad59bc1f20a4995b23d2794be17227b51 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 29 Dec 2014 18:19:22 +0000 Subject: Add break-after property support. --- src/select/properties/break_after.c | 45 +++++++++---------------------------- 1 file changed, 10 insertions(+), 35 deletions(-) (limited to 'src/select/properties/break_after.c') diff --git a/src/select/properties/break_after.c b/src/select/properties/break_after.c index 8a2cffc..496a59b 100644 --- a/src/select/properties/break_after.c +++ b/src/select/properties/break_after.c @@ -17,56 +17,31 @@ css_error css__cascade_break_after(uint32_t opv, css_style *style, css_select_state *state) { - UNUSED(style); - - if (isInherit(opv) == false) { - switch (getValue(opv)) { - case BREAK_AFTER_AUTO: - case BREAK_AFTER_ALWAYS: - case BREAK_AFTER_AVOID: - case BREAK_AFTER_LEFT: - case BREAK_AFTER_RIGHT: - case BREAK_AFTER_PAGE: - case BREAK_AFTER_COLUMN: - case BREAK_AFTER_AVOID_PAGE: - case BREAK_AFTER_AVOID_COLUMN: - /** \todo convert to public values */ - break; - } - } - - if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, - isInherit(opv))) { - /** \todo set computed elevation */ - } - - return CSS_OK; + return css__cascade_break_after_before_inside(opv, style, state, + set_break_after); } css_error css__set_break_after_from_hint(const css_hint *hint, css_computed_style *style) { - UNUSED(hint); - UNUSED(style); - - return CSS_OK; + return set_break_after(style, hint->status); } css_error css__initial_break_after(css_select_state *state) { - UNUSED(state); - - return CSS_OK; + return set_break_after(state->computed, CSS_BREAK_AFTER_AUTO); } css_error css__compose_break_after(const css_computed_style *parent, const css_computed_style *child, css_computed_style *result) { - UNUSED(parent); - UNUSED(child); - UNUSED(result); + uint8_t type = get_break_after(child); + + if (type == CSS_BREAK_AFTER_INHERIT) { + type = get_break_after(parent); + } - return CSS_OK; + return set_break_after(result, type); } -- cgit v1.2.3