port latest updates to C

This commit is contained in:
Christopher Chedeau
2014-04-22 14:59:59 -07:00
parent fa2f7080e2
commit aad9fab75f
5 changed files with 32931 additions and 26 deletions

View File

@@ -421,9 +421,12 @@ void layoutNode(css_node_t *node) {
leadingCrossDim += remainingCrossDim;
} else if (alignItem == CSS_ALIGN_STRETCH) {
if (!isDimDefined(child, crossAxis)) {
child->layout.dimensions[dim[crossAxis]] = node->layout.dimensions[dim[crossAxis]] -
getPaddingAndBorderAxis(node, crossAxis) -
getMarginAxis(child, crossAxis);
child->layout.dimensions[dim[crossAxis]] = fmaxf(
node->layout.dimensions[dim[crossAxis]] -
getPaddingAndBorderAxis(node, crossAxis) -
getMarginAxis(child, crossAxis),
getPaddingAndBorderAxis(child, crossAxis)
);
}
}
child->layout.position[pos[crossAxis]] += leadingCrossDim;