From 3cb7a56c6e0c6abce0b61a4f9169e31dbe2615b4 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 16 Nov 2014 12:21:02 +0000 Subject: Fix column-fill computed style offset. --- src/select/propget.h | 2 +- src/select/propset.h | 2 +- test/data/select/tests1.dat | 44 ++++++++++++++++++++++---------------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/select/propget.h b/src/select/propget.h index 6150ff7..499f705 100644 --- a/src/select/propget.h +++ b/src/select/propget.h @@ -366,7 +366,7 @@ static inline uint8_t get_column_count( #undef COLUMN_COUNT_INDEX #define COLUMN_FILL_INDEX 8 -#define COLUMN_FILL_SHIFT 6 +#define COLUMN_FILL_SHIFT 4 #define COLUMN_FILL_MASK 0x30 static inline uint8_t get_column_fill( const css_computed_style *style) diff --git a/src/select/propset.h b/src/select/propset.h index 834ed77..07ba906 100644 --- a/src/select/propset.h +++ b/src/select/propset.h @@ -434,7 +434,7 @@ static inline css_error set_column_count( #undef COLUMN_COUNT_INDEX #define COLUMN_FILL_INDEX 8 -#define COLUMN_FILL_SHIFT 6 +#define COLUMN_FILL_SHIFT 4 #define COLUMN_FILL_MASK 0x30 static inline css_error set_column_fill( css_computed_style *style, uint8_t type) diff --git a/test/data/select/tests1.dat b/test/data/select/tests1.dat index a178ac7..8a1cd6c 100644 --- a/test/data/select/tests1.dat +++ b/test/data/select/tests1.dat @@ -2031,7 +2031,7 @@ clear: none clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2136,7 +2136,7 @@ clear: none clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2241,7 +2241,7 @@ clear: none clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2346,7 +2346,7 @@ clear: none clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2451,7 +2451,7 @@ clear: inherit clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2556,7 +2556,7 @@ clear: left clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2661,7 +2661,7 @@ clear: both clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2766,7 +2766,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2871,7 +2871,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -2976,7 +2976,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3081,7 +3081,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3186,7 +3186,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3291,7 +3291,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3396,7 +3396,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3501,7 +3501,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3606,7 +3606,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3711,7 +3711,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3816,7 +3816,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -3921,7 +3921,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -4026,7 +4026,7 @@ clear: right clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -4222,7 +4222,7 @@ clear: none clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal @@ -4320,7 +4320,7 @@ clear: none clip: auto color: inherit column-count: auto -column-fill: inherit +column-fill: balance column-gap: normal column-rule-color: inherit content: normal -- cgit v1.2.3