diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-11-16 15:18:00 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-11-16 15:18:00 +0000 |
| commit | 34271c0f32bca359af8f7a6c40f166d402b78eb6 (patch) | |
| tree | e275a43f740f7baeb6d0e41bed3ef8de1de27e87 /src/select/propset.h | |
| parent | 34fc236550a686d947458a2ce7f9a081b2b6d22c (diff) | |
| download | libcss-34271c0f32bca359af8f7a6c40f166d402b78eb6.tar.gz libcss-34271c0f32bca359af8f7a6c40f166d402b78eb6.tar.bz2 | |
Add column-rule-width to computed styles.
Diffstat (limited to 'src/select/propset.h')
| -rw-r--r-- | src/select/propset.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/select/propset.h b/src/select/propset.h index 5aa253e..6dcfbc6 100644 --- a/src/select/propset.h +++ b/src/select/propset.h @@ -28,7 +28,8 @@ static const css_computed_uncommon default_uncommon = { (CSS_CLIP_AUTO << 2) | CSS_CONTENT_NORMAL, (CSS_COLUMN_COUNT_AUTO << 6) | (CSS_COLUMN_FILL_BALANCE << 4) | (CSS_COLUMN_RULE_STYLE_NONE << 0), - (CSS_COLUMN_GAP_NORMAL << 2) | (CSS_COLUMN_RULE_COLOR_CURRENT_COLOR) + (CSS_COLUMN_GAP_NORMAL << 2) | (CSS_COLUMN_RULE_COLOR_CURRENT_COLOR), + (CSS_COLUMN_RULE_WIDTH_MEDIUM << 1) }, { 0, 0 }, { 0, 0, 0, 0 }, @@ -39,6 +40,7 @@ static const css_computed_uncommon default_uncommon = { 0, 0, 0, + 0, NULL, NULL, NULL, @@ -528,6 +530,31 @@ static inline css_error set_column_rule_style( #undef COLUMN_RULE_STYLE_SHIFT #undef COLUMN_RULE_STYLE_INDEX +#define COLUMN_RULE_WIDTH_INDEX 10 +#define COLUMN_RULE_WIDTH_SHIFT 1 +#define COLUMN_RULE_WIDTH_MASK 0xfe +static inline css_error set_column_rule_width( + css_computed_style *style, uint8_t type, + css_fixed length, css_unit unit) +{ + uint8_t *bits; + + ENSURE_UNCOMMON; + + bits = &style->uncommon->bits[COLUMN_RULE_WIDTH_INDEX]; + + /* 7bits: uuuuttt : units | type */ + *bits = (*bits & ~COLUMN_RULE_WIDTH_MASK) | + (((type & 0x7) | (unit << 3)) << COLUMN_RULE_WIDTH_SHIFT); + + style->uncommon->column_rule_width = length; + + return CSS_OK; +} +#undef COLUMN_RULE_WIDTH_MASK +#undef COLUMN_RULE_WIDTH_SHIFT +#undef COLUMN_RULE_WIDTH_INDEX + #define CONTENT_INDEX 7 #define CONTENT_SHIFT 0 #define CONTENT_MASK 0x3 |