diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-29 21:51:45 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-29 21:51:45 +0000 |
commit | 6ba000db056d7e9b70a7e154a003644046bf7e98 (patch) | |
tree | 30c43ec8543ec9cb66169721e3268ea0a7cdb76f /src/select/properties | |
parent | 1b13f81b8259f4416df7b3063cb280cb977722d7 (diff) | |
download | libcss-6ba000db056d7e9b70a7e154a003644046bf7e98.tar.gz libcss-6ba000db056d7e9b70a7e154a003644046bf7e98.tar.bz2 |
Add support for opacity property
svn path=/trunk/libcss/; revision=11527
Diffstat (limited to 'src/select/properties')
-rw-r--r-- | src/select/properties/Makefile | 1 | ||||
-rw-r--r-- | src/select/properties/opacity.c | 62 | ||||
-rw-r--r-- | src/select/properties/properties.h | 1 |
3 files changed, 64 insertions, 0 deletions
diff --git a/src/select/properties/Makefile b/src/select/properties/Makefile index 1721205..7f48fab 100644 --- a/src/select/properties/Makefile +++ b/src/select/properties/Makefile @@ -56,6 +56,7 @@ max_height.c \ max_width.c \ min_height.c \ min_width.c \ +opacity.c \ orphans.c \ outline_color.c \ outline_style.c \ diff --git a/src/select/properties/opacity.c b/src/select/properties/opacity.c new file mode 100644 index 0000000..9ef0998 --- /dev/null +++ b/src/select/properties/opacity.c @@ -0,0 +1,62 @@ +/* + * This file is part of LibCSS + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2011 John-Mark Bell <jmb@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_opacity(uint32_t opv, css_style *style, + css_select_state *state) +{ + uint16_t value = CSS_OPACITY_INHERIT; + css_fixed opacity = 0; + + if (isInherit(opv) == false) { + value = CSS_Z_INDEX_SET; + + opacity = *((css_fixed *) style->bytecode); + advance_bytecode(style, sizeof(opacity)); + } + + if (css__outranks_existing(getOpcode(opv), isImportant(opv), state, + isInherit(opv))) { + return set_opacity(state->computed, value, opacity); + } + + return CSS_OK; +} + +css_error css__set_opacity_from_hint(const css_hint *hint, + css_computed_style *style) +{ + return set_opacity(style, hint->status, hint->data.fixed); +} + +css_error css__initial_opacity(css_select_state *state) +{ + return set_opacity(state->computed, CSS_OPACITY_SET, INTTOFIX(1)); +} + +css_error css__compose_opacity(const css_computed_style *parent, + const css_computed_style *child, + css_computed_style *result) +{ + css_fixed opacity = 0; + uint8_t type = get_opacity(child, &opacity); + + if (type == CSS_OPACITY_INHERIT) { + type = get_opacity(parent, &opacity); + } + + return set_opacity(result, type, opacity); +} + diff --git a/src/select/properties/properties.h b/src/select/properties/properties.h index 5312ce9..2f3fca4 100644 --- a/src/select/properties/properties.h +++ b/src/select/properties/properties.h @@ -77,6 +77,7 @@ PROPERTY_FUNCS(max_height); PROPERTY_FUNCS(max_width); PROPERTY_FUNCS(min_height); PROPERTY_FUNCS(min_width); +PROPERTY_FUNCS(opacity); PROPERTY_FUNCS(orphans); PROPERTY_FUNCS(outline_color); PROPERTY_FUNCS(outline_style); |