DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

fixups

Browse Source
This commit is contained in:
Lukas Woehrl
2016-12-23 23:22:48 +01:00
parent b80d1fd893
commit 5304040161
3 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/YGDefaultValuesTest.cpp
View File

@@ -27,28 +27,28 @@ TEST(YogaTest, assert_default_values) {
ASSERT_EQ(YGOverflowVisible, YGNodeStyleGetOverflow(root)); ASSERT_EQ(YGOverflowVisible, YGNodeStyleGetOverflow(root));
ASSERT_FLOAT_EQ(0, YGNodeStyleGetFlexGrow(root)); ASSERT_FLOAT_EQ(0, YGNodeStyleGetFlexGrow(root));
ASSERT_FLOAT_EQ(0, YGNodeStyleGetFlexShrink(root)); ASSERT_FLOAT_EQ(0, YGNodeStyleGetFlexShrink(root));
ASSERT_FALSE(YGNodeStyleGetFlexBasis(root).isDefined); ASSERT_FALSE(YGNodeStyleGetFlexBasis(root).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeLeft).isDefined); ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeLeft).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeTop).isDefined); ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeTop).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeRight).isDefined); ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeRight).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeBottom).isDefined); ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeBottom).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeStart).isDefined); ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeStart).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeEnd).isDefined); ASSERT_FALSE(YGNodeStyleGetPosition(root, YGEdgeEnd).unit != YGUnitUndefined);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeLeft).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeLeft).value);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeTop).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeTop).value);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeRight).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeRight).value);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeBottom).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetMargin(root, YGEdgeBottom).value);
ASSERT_FALSE(YGNodeStyleGetMargin(root, YGEdgeStart).isDefined); ASSERT_FALSE(YGNodeStyleGetMargin(root, YGEdgeStart).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetMargin(root, YGEdgeEnd).isDefined); ASSERT_FALSE(YGNodeStyleGetMargin(root, YGEdgeEnd).unit != YGUnitUndefined);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeLeft).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeLeft).value);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeTop).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeTop).value);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeRight).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeRight).value);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeBottom).value); ASSERT_FLOAT_EQ(0, YGNodeStyleGetPadding(root, YGEdgeBottom).value);
ASSERT_FALSE(YGNodeStyleGetPadding(root, YGEdgeStart).isDefined); ASSERT_FALSE(YGNodeStyleGetPadding(root, YGEdgeStart).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetPadding(root, YGEdgeEnd).isDefined); ASSERT_FALSE(YGNodeStyleGetPadding(root, YGEdgeEnd).unit != YGUnitUndefined);
ASSERT_FLOAT_EQ(0, YGNodeStyleGetBorder(root, YGEdgeLeft)); ASSERT_FLOAT_EQ(0, YGNodeStyleGetBorder(root, YGEdgeLeft));
ASSERT_FLOAT_EQ(0, YGNodeStyleGetBorder(root, YGEdgeTop)); ASSERT_FLOAT_EQ(0, YGNodeStyleGetBorder(root, YGEdgeTop));
@@ -57,12 +57,12 @@ TEST(YogaTest, assert_default_values) {
ASSERT_TRUE(YGFloatIsUndefined(YGNodeStyleGetBorder(root, YGEdgeStart))); ASSERT_TRUE(YGFloatIsUndefined(YGNodeStyleGetBorder(root, YGEdgeStart)));
ASSERT_TRUE(YGFloatIsUndefined(YGNodeStyleGetBorder(root, YGEdgeEnd))); ASSERT_TRUE(YGFloatIsUndefined(YGNodeStyleGetBorder(root, YGEdgeEnd)));
ASSERT_FALSE(YGNodeStyleGetWidth(root).isDefined); ASSERT_FALSE(YGNodeStyleGetWidth(root).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetHeight(root).isDefined); ASSERT_FALSE(YGNodeStyleGetHeight(root).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetMinWidth(root).isDefined); ASSERT_FALSE(YGNodeStyleGetMinWidth(root).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetMinHeight(root).isDefined); ASSERT_FALSE(YGNodeStyleGetMinHeight(root).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetMaxWidth(root).isDefined); ASSERT_FALSE(YGNodeStyleGetMaxWidth(root).unit != YGUnitUndefined);
ASSERT_FALSE(YGNodeStyleGetMaxHeight(root).isDefined); ASSERT_FALSE(YGNodeStyleGetMaxHeight(root).unit != YGUnitUndefined);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root)); ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root)); ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));

2
tests/YGStyleTest.cpp
View File

@@ -26,7 +26,7 @@ TEST(YogaTest, copy_style_modified) {
const YGNodeRef node0 = YGNodeNew(); const YGNodeRef node0 = YGNodeNew();
ASSERT_FALSE(YGNodeIsDirty(node0)); ASSERT_FALSE(YGNodeIsDirty(node0));
ASSERT_EQ(YGFlexDirectionColumn, YGNodeStyleGetFlexDirection(node0)); ASSERT_EQ(YGFlexDirectionColumn, YGNodeStyleGetFlexDirection(node0));
ASSERT_FALSE(YGNodeStyleGetMaxHeight(node0).isDefined); ASSERT_FALSE(YGNodeStyleGetMaxHeight(node0).unit != YGUnitUndefined);
const YGNodeRef node1 = YGNodeNew(); const YGNodeRef node1 = YGNodeNew();
YGNodeStyleSetFlexDirection(node1, YGFlexDirectionRow); YGNodeStyleSetFlexDirection(node1, YGFlexDirectionRow);

18
yoga/Yoga.c
View File

@@ -111,18 +111,6 @@ typedef struct YGNode {
.unit = YGUnitUndefined \ .unit = YGUnitUndefined \
} }
#define YG_DEFAULT_EDGE_VALUES { \
[YGEdgeLeft] = YGUndefined, \
[YGEdgeTop] = YGUndefined, \
[YGEdgeRight] = YGUndefined, \
[YGEdgeBottom] = YGUndefined, \
[YGEdgeStart] = YGUndefined, \
[YGEdgeEnd] = YGUndefined, \
[YGEdgeHorizontal] = YGUndefined, \
[YGEdgeVertical] = YGUndefined, \
[YGEdgeAll] = YGUndefined, \
}
#define YG_DEFAULT_EDGE_VALUES_UNIT { \ #define YG_DEFAULT_EDGE_VALUES_UNIT { \
[YGEdgeLeft] = YG_UNDEFINED_VALUES, \ [YGEdgeLeft] = YG_UNDEFINED_VALUES, \
[YGEdgeTop] = YG_UNDEFINED_VALUES, \ [YGEdgeTop] = YG_UNDEFINED_VALUES, \
@@ -168,7 +156,7 @@ static YGNode gYGNodeDefaults = {
.position = YG_DEFAULT_EDGE_VALUES_UNIT, .position = YG_DEFAULT_EDGE_VALUES_UNIT,
.margin = YG_DEFAULT_EDGE_VALUES_UNIT, .margin = YG_DEFAULT_EDGE_VALUES_UNIT,
.padding = YG_DEFAULT_EDGE_VALUES_UNIT, .padding = YG_DEFAULT_EDGE_VALUES_UNIT,
.border = YG_DEFAULT_EDGE_VALUES, .border = YG_DEFAULT_EDGE_VALUES_UNIT,
.aspectRatio = YGUndefined, .aspectRatio = YGUndefined,
}, },
@@ -968,7 +956,7 @@ static float YGNodeLeadingPosition(const YGNodeRef node, const YGFlexDirection a
const YGValue * leadingPosition = const YGValue * leadingPosition =
YGComputedEdgeValue(node->style.position, leading[axis], &YGValueUndefined); YGComputedEdgeValue(node->style.position, leading[axis], &YGValueUndefined);
return !leadingPosition->unit != YGUnitUndefined ? 0.0f : YGValueResolve(leadingPosition, axisSize); return leadingPosition->unit == YGUnitUndefined ? 0.0f : YGValueResolve(leadingPosition, axisSize);
} }
static float YGNodeTrailingPosition(const YGNodeRef node, const YGFlexDirection axis, const float axisSize) { static float YGNodeTrailingPosition(const YGNodeRef node, const YGFlexDirection axis, const float axisSize) {
@@ -983,7 +971,7 @@ static float YGNodeTrailingPosition(const YGNodeRef node, const YGFlexDirection
const YGValue * trailingPosition = const YGValue * trailingPosition =
YGComputedEdgeValue(node->style.position, trailing[axis], &YGValueUndefined); YGComputedEdgeValue(node->style.position, trailing[axis], &YGValueUndefined);
return !trailingPosition->unit != YGUnitUndefined ? 0.0f : YGValueResolve(trailingPosition, axisSize); return trailingPosition->unit == YGUnitUndefined ? 0.0f : YGValueResolve(trailingPosition, axisSize);
} }
static float YGNodeBoundAxisWithinMinAndMax(const YGNodeRef node, static float YGNodeBoundAxisWithinMinAndMax(const YGNodeRef node,