Skip to content

select: computed: Fix lost unit in relative position offset derivation #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
metan-ucw wants to merge 1 commit into from
Closed

select: computed: Fix lost unit in relative position offset derivation #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/select/computed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,17 +474,19 @@ uint8_t css_computed_top(const css_computed_style *style,
/* Static -> auto */
top = CSS_TOP_AUTO;
} else if (position == CSS_POSITION_RELATIVE) {
css_fixed olength;
css_unit ounit;
/* Relative -> follow $9.4.3 */
uint8_t bottom = get_bottom_bits(style);
uint8_t bottom = get_bottom(style, &olength, &ounit);

if (top == CSS_TOP_AUTO && (bottom & 0x3) == CSS_BOTTOM_AUTO) {
/* Both auto => 0px */
*length = 0;
*unit = CSS_UNIT_PX;
} else if (top == CSS_TOP_AUTO) {
/* Top is auto => -bottom */
*length = -style->i.bottom;
*unit = (css_unit) (bottom >> 2);
/* Top is auto => -bottom. */
*length = -olength;
*unit = ounit;
}

top = CSS_TOP_SET;
Expand All @@ -504,17 +506,19 @@ uint8_t css_computed_right(const css_computed_style *style,
/* Static -> auto */
right = CSS_RIGHT_AUTO;
} else if (position == CSS_POSITION_RELATIVE) {
css_fixed olength;
css_unit ounit;
/* Relative -> follow $9.4.3 */
uint8_t left = get_left_bits(style);
uint8_t left = get_left(style, &olength, &ounit);

if (right == CSS_RIGHT_AUTO && (left & 0x3) == CSS_LEFT_AUTO) {
/* Both auto => 0px */
*length = 0;
*unit = CSS_UNIT_PX;
} else if (right == CSS_RIGHT_AUTO) {
/* Right is auto => -left */
*length = -style->i.left;
*unit = (css_unit) (left >> 2);
*length = -olength;
*unit = ounit;
} else {
/** \todo Consider containing block's direction
* if overconstrained */
Expand All @@ -537,8 +541,10 @@ uint8_t css_computed_bottom(const css_computed_style *style,
/* Static -> auto */
bottom = CSS_BOTTOM_AUTO;
} else if (position == CSS_POSITION_RELATIVE) {
css_fixed olength;
css_unit ounit;
/* Relative -> follow $9.4.3 */
uint8_t top = get_top_bits(style);
uint8_t top = get_top(style, &olength, &ounit);

if (bottom == CSS_BOTTOM_AUTO && (top & 0x3) == CSS_TOP_AUTO) {
/* Both auto => 0px */
Expand All @@ -547,8 +553,8 @@ uint8_t css_computed_bottom(const css_computed_style *style,
} else if (bottom == CSS_BOTTOM_AUTO ||
(top & 0x3) != CSS_TOP_AUTO) {
/* Bottom is auto or top is not auto => -top */
*length = -style->i.top;
*unit = (css_unit) (top >> 2);
*length = -olength;
*unit = ounit;
}

bottom = CSS_BOTTOM_SET;
Expand All @@ -568,17 +574,19 @@ uint8_t css_computed_left(const css_computed_style *style,
/* Static -> auto */
left = CSS_LEFT_AUTO;
} else if (position == CSS_POSITION_RELATIVE) {
css_fixed olength;
css_unit ounit;
/* Relative -> follow $9.4.3 */
uint8_t right = get_right_bits(style);
uint8_t right = get_right(style, &olength, &ounit);

if (left == CSS_LEFT_AUTO && (right & 0x3) == CSS_RIGHT_AUTO) {
/* Both auto => 0px */
*length = 0;
*unit = CSS_UNIT_PX;
} else if (left == CSS_LEFT_AUTO) {
/* Left is auto => -right */
*length = -style->i.right;
*unit = (css_unit) (right >> 2);
*length = -olength;
*unit = ounit;
} else {
/** \todo Consider containing block's direction
* if overconstrained */
Expand Down