Permalink
Browse files

Move trailing border function as a method on YGNode

Reviewed By: emilsjolander

Differential Revision: D6711666

fbshipit-source-id: fe4fdfc2db59d03beb763317e1a6f9de52f851d4
  • Loading branch information...
priteshrnandgaonkar authored and facebook-github-bot committed Jan 15, 2018
1 parent 210ae5b commit 82088580ab17417a51386722f98b83d6cad0a6a0
Showing with 22 additions and 23 deletions.
  1. +13 −0 ReactCommon/yoga/yoga/YGNode.cpp
  2. +1 −0 ReactCommon/yoga/yoga/YGNode.h
  3. +8 −23 ReactCommon/yoga/yoga/Yoga.cpp
@@ -608,3 +608,16 @@ float YGNode::getLeadingBorder(const YGFlexDirection axis) {
YGComputedEdgeValue(style_.border, leading[axis], &YGValueZero)->value,
0.0f);
}
float YGNode::getTrailingBorder(const YGFlexDirection flexDirection) {
if (YGFlexDirectionIsRow(flexDirection) &&
style_.border[YGEdgeEnd].unit != YGUnitUndefined &&
style_.border[YGEdgeEnd].value >= 0.0f) {
return style_.border[YGEdgeEnd].value;
}
return fmaxf(
YGComputedEdgeValue(style_.border, trailing[flexDirection], &YGValueZero)
->value,
0.0f);
}
@@ -86,6 +86,7 @@ struct YGNode {
float getLeadingMargin(const YGFlexDirection axis, const float widthSize);
float getTrailingMargin(const YGFlexDirection axis, const float widthSize);
float getLeadingBorder(const YGFlexDirection flexDirection);
float getTrailingBorder(const YGFlexDirection flexDirection);
// Setters
void setContext(void* context);
@@ -797,21 +797,6 @@ static float YGNodeTrailingPadding(const YGNodeRef node,
0.0f);
}
static float YGNodeTrailingBorder(
const YGNodeRef node,
const YGFlexDirection axis) {
if (YGFlexDirectionIsRow(axis) &&
node->getStyle().border[YGEdgeEnd].unit != YGUnitUndefined &&
node->getStyle().border[YGEdgeEnd].value >= 0.0f) {
return node->getStyle().border[YGEdgeEnd].value;
}
return fmaxf(
YGComputedEdgeValue(node->getStyle().border, trailing[axis], &YGValueZero)
->value,
0.0f);
}
static inline float YGNodeLeadingPaddingAndBorder(
const YGNodeRef node,
const YGFlexDirection axis,
@@ -823,7 +808,8 @@ static inline float YGNodeLeadingPaddingAndBorder(
static inline float YGNodeTrailingPaddingAndBorder(const YGNodeRef node,
const YGFlexDirection axis,
const float widthSize) {
return YGNodeTrailingPadding(node, axis, widthSize) + YGNodeTrailingBorder(node, axis);
return YGNodeTrailingPadding(node, axis, widthSize) +
node->getTrailingBorder(axis);
}
static inline float YGNodeMarginForAxis(const YGNodeRef node,
@@ -1221,7 +1207,7 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
child->isTrailingPosDefined(YGFlexDirectionRow)) {
childWidth = node->getLayout().measuredDimensions[YGDimensionWidth] -
(node->getLeadingBorder(YGFlexDirectionRow) +
YGNodeTrailingBorder(node, YGFlexDirectionRow)) -
node->getTrailingBorder(YGFlexDirectionRow)) -
(child->getLeadingPosition(YGFlexDirectionRow, width) +
child->getTrailingPosition(YGFlexDirectionRow, width));
childWidth = YGNodeBoundAxis(child, YGFlexDirectionRow, childWidth, width, width);
@@ -1240,7 +1226,7 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
child->isTrailingPosDefined(YGFlexDirectionColumn)) {
childHeight = node->getLayout().measuredDimensions[YGDimensionHeight] -
(node->getLeadingBorder(YGFlexDirectionColumn) +
YGNodeTrailingBorder(node, YGFlexDirectionColumn)) -
node->getTrailingBorder(YGFlexDirectionColumn)) -
(child->getLeadingPosition(YGFlexDirectionColumn, height) +
child->getTrailingPosition(YGFlexDirectionColumn, height));
childHeight = YGNodeBoundAxis(child, YGFlexDirectionColumn, childHeight, height, width);
@@ -1311,7 +1297,7 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
child->setLayoutPosition(
node->getLayout().measuredDimensions[dim[mainAxis]] -
child->getLayout().measuredDimensions[dim[mainAxis]] -
YGNodeTrailingBorder(node, mainAxis) -
node->getTrailingBorder(mainAxis) -
child->getTrailingMargin(mainAxis, width) -
child->getTrailingPosition(
mainAxis, isMainAxisRow ? width : height),
@@ -1338,7 +1324,7 @@ static void YGNodeAbsoluteLayoutChild(const YGNodeRef node,
child->setLayoutPosition(
node->getLayout().measuredDimensions[dim[crossAxis]] -
child->getLayout().measuredDimensions[dim[crossAxis]] -
YGNodeTrailingBorder(node, crossAxis) -
node->getTrailingBorder(crossAxis) -
child->getTrailingMargin(crossAxis, width) -
child->getTrailingPosition(
crossAxis, isMainAxisRow ? height : width),
@@ -1775,11 +1761,10 @@ static void YGNodelayoutImpl(const YGNodeRef node,
node->getTrailingMargin(flexColumnDirection, parentWidth), YGEdgeBottom);
node->setLayoutBorder(node->getLeadingBorder(flexRowDirection), YGEdgeStart);
node->setLayoutBorder(
YGNodeTrailingBorder(node, flexRowDirection), YGEdgeEnd);
node->setLayoutBorder(node->getTrailingBorder(flexRowDirection), YGEdgeEnd);
node->setLayoutBorder(node->getLeadingBorder(flexColumnDirection), YGEdgeTop);
node->setLayoutBorder(
YGNodeTrailingBorder(node, flexColumnDirection), YGEdgeBottom);
node->getTrailingBorder(flexColumnDirection), YGEdgeBottom);
node->setLayoutPadding(
YGNodeLeadingPadding(node, flexRowDirection, parentWidth), YGEdgeStart);

0 comments on commit 8208858

Please sign in to comment.