diff options
author | Michael Drake <michael.drake@codethink.co.uk> | 2017-04-27 14:13:44 +0100 |
---|---|---|
committer | Michael Drake <michael.drake@codethink.co.uk> | 2017-04-27 14:13:44 +0100 |
commit | a0d2da319d3c13549e24ac012c9dbb2b22fdb957 (patch) | |
tree | 005e54c5b37286c0cc9c355acce149ccd935c439 /src/select/properties | |
parent | 4729f01919b7ba3f99abfea8900931616fbb8320 (diff) | |
parent | ab5bd6f9d75878740cfe98581bdd8f8ba614853d (diff) | |
download | libcss-a0d2da319d3c13549e24ac012c9dbb2b22fdb957.tar.gz libcss-a0d2da319d3c13549e24ac012c9dbb2b22fdb957.tar.bz2 |
Merge branch 'tlsa/box-sizing'
Diffstat (limited to 'src/select/properties')
-rw-r--r-- | src/select/properties/Makefile | 1 | ||||
-rw-r--r-- | src/select/properties/box_sizing.c | 67 | ||||
-rw-r--r-- | src/select/properties/properties.h | 1 |
3 files changed, 69 insertions, 0 deletions
diff --git a/src/select/properties/Makefile b/src/select/properties/Makefile index ce3ddfa..288eda9 100644 --- a/src/select/properties/Makefile +++ b/src/select/properties/Makefile @@ -21,6 +21,7 @@ border_top_color.c \ border_top_style.c \ border_top_width.c \ bottom.c \ +box_sizing.c \ break_after.c \ break_before.c \ break_inside.c \ diff --git a/src/select/properties/box_sizing.c b/src/select/properties/box_sizing.c new file mode 100644 index 0000000..91c475d --- /dev/null +++ b/src/select/properties/box_sizing.c @@ -0,0 +1,67 @@ +/* + * This file is part of LibCSS + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2017 Michael Drake <tlsa@netsurf-browser.org> + */ + +#include "bytecode/bytecode.h" +#include "bytecode/opcodes.h" +#include "select/propset.h" +#include "select/propget.h" +#include "utils/utils.h" + +#include "select/properties/properties.h" +#include "select/properties/helpers.h" + +css_error css__cascade_box_sizing(uint32_t opv, css_style *style, + css_select_state *state) +{ + uint16_t value = CSS_BOX_SIZING_INHERIT; + + UNUSED(style); + + if (isInherit(opv) == false) { + switch (getValue(opv)) { + case BOX_SIZING_CONTENT_BOX: + value = CSS_BOX_SIZING_CONTENT_BOX; + break; + case BOX_SIZING_BORDER_BOX: + value = CSS_BOX_SIZING_BORDER_BOX; + break; + } + } + + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, + isInherit(opv))) { + return set_box_sizing(state->computed, value); + } + + return CSS_OK; +} + +css_error css__set_box_sizing_from_hint(const css_hint *hint, + css_computed_style *style) +{ + return set_box_sizing(style, hint->status); +} + +css_error css__initial_box_sizing(css_select_state *state) +{ + return set_box_sizing(state->computed, CSS_BOX_SIZING_CONTENT_BOX); +} + +css_error css__compose_box_sizing( + const css_computed_style *parent, + const css_computed_style *child, + css_computed_style *result) +{ + uint8_t type = get_box_sizing(child); + + if (type == CSS_BOX_SIZING_INHERIT) { + type = get_box_sizing(parent); + } + + return set_box_sizing(result, type); +} + diff --git a/src/select/properties/properties.h b/src/select/properties/properties.h index f0ab29d..a1ab49f 100644 --- a/src/select/properties/properties.h +++ b/src/select/properties/properties.h @@ -42,6 +42,7 @@ PROPERTY_FUNCS(border_right_width); PROPERTY_FUNCS(border_bottom_width); PROPERTY_FUNCS(border_left_width); PROPERTY_FUNCS(bottom); +PROPERTY_FUNCS(box_sizing); PROPERTY_FUNCS(break_after); PROPERTY_FUNCS(break_before); PROPERTY_FUNCS(break_inside); |