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

yoga::resolveValue -> Length::resolve (#1520)

Browse Source 
Summary:
X-link: https://github.com/facebook/react-native/pull/41939

Pull Request resolved: https://github.com/facebook/yoga/pull/1520

This code originates as `YGValueResolve`, used to compute a YGValue to a length in points, using a reference for 100%.

This moves it to `Style::Length`, so we can encapsulate parts of it (for style value functions), and make the API more cohesive now that we can do C++ style OOP with it.

Changelog: [Internal]

Reviewed By: joevilches

Differential Revision: D51796973

fbshipit-source-id: a7c359c7544f4bd2066a80d976dde67a0d16f1dd
This commit is contained in:
Nick Gerleman
2023-12-19 13:38:40 -08:00
committed by Facebook GitHub Bot
parent 192016a0a8
commit ca4ecc044d
6 changed files with 74 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
yoga/node/Node.cpp
View File

@@ -10,7 +10,6 @@
#include <iostream>
#include <yoga/algorithm/FlexDirection.h>
#include <yoga/algorithm/ResolveValue.h>
#include <yoga/debug/AssertFatal.h>
#include <yoga/node/Node.h>
#include <yoga/numeric/Comparison.h>
@@ -166,7 +165,7 @@ float Node::getFlexStartPosition(
flexStartEdge(axis))
: computeEdgeValueForColumn<&Style::position>(flexStartEdge(axis));
return resolveValue(leadingPosition, axisSize).unwrapOrDefault(0.0f);
return leadingPosition.resolve(axisSize).unwrapOrDefault(0.0f);
}
float Node::getInlineStartPosition(
@@ -178,7 +177,7 @@ float Node::getInlineStartPosition(
? computeEdgeValueForRow<&Style::position>(Edge::Start, startEdge)
: computeEdgeValueForColumn<&Style::position>(startEdge);
return resolveValue(leadingPosition, axisSize).unwrapOrDefault(0.0f);
return leadingPosition.resolve(axisSize).unwrapOrDefault(0.0f);
}
float Node::getFlexEndPosition(
@@ -191,7 +190,7 @@ float Node::getFlexEndPosition(
flexEndEdge(axis))
: computeEdgeValueForColumn<&Style::position>(flexEndEdge(axis));
return resolveValue(trailingPosition, axisSize).unwrapOrDefault(0.0f);
return trailingPosition.resolve(axisSize).unwrapOrDefault(0.0f);
}
float Node::getInlineEndPosition(
@@ -203,7 +202,7 @@ float Node::getInlineEndPosition(
? computeEdgeValueForRow<&Style::position>(Edge::End, endEdge)
: computeEdgeValueForColumn<&Style::position>(endEdge);
return resolveValue(trailingPosition, axisSize).unwrapOrDefault(0.0f);
return trailingPosition.resolve(axisSize).unwrapOrDefault(0.0f);
}
float Node::getFlexStartMargin(
@@ -216,7 +215,7 @@ float Node::getFlexStartMargin(
flexStartEdge(axis))
: computeEdgeValueForColumn<&Style::margin>(flexStartEdge(axis));
return resolveValue(leadingMargin, widthSize).unwrapOrDefault(0.0f);
return leadingMargin.resolve(widthSize).unwrapOrDefault(0.0f);
}
float Node::getInlineStartMargin(
@@ -228,7 +227,7 @@ float Node::getInlineStartMargin(
? computeEdgeValueForRow<&Style::margin>(Edge::Start, startEdge)
: computeEdgeValueForColumn<&Style::margin>(startEdge);
return resolveValue(leadingMargin, widthSize).unwrapOrDefault(0.0f);
return leadingMargin.resolve(widthSize).unwrapOrDefault(0.0f);
}
float Node::getFlexEndMargin(
@@ -241,7 +240,7 @@ float Node::getFlexEndMargin(
flexEndEdge(axis))
: computeEdgeValueForColumn<&Style::margin>(flexEndEdge(axis));
return resolveValue(trailingMargin, widthSize).unwrapOrDefault(0.0f);
return trailingMargin.resolve(widthSize).unwrapOrDefault(0.0f);
}
float Node::getInlineEndMargin(
@@ -253,7 +252,7 @@ float Node::getInlineEndMargin(
? computeEdgeValueForRow<&Style::margin>(Edge::End, endEdge)
: computeEdgeValueForColumn<&Style::margin>(endEdge);
return resolveValue(trailingMargin, widthSize).unwrapOrDefault(0.0f);
return trailingMargin.resolve(widthSize).unwrapOrDefault(0.0f);
}
float Node::getInlineStartBorder(FlexDirection axis, Direction direction)
@@ -304,7 +303,7 @@ float Node::getInlineStartPadding(
? computeEdgeValueForRow<&Style::padding>(Edge::Start, startEdge)
: computeEdgeValueForColumn<&Style::padding>(startEdge);
return maxOrDefined(resolveValue(leadingPadding, widthSize).unwrap(), 0.0f);
return maxOrDefined(leadingPadding.resolve(widthSize).unwrap(), 0.0f);
}
float Node::getFlexStartPadding(
@@ -317,7 +316,7 @@ float Node::getFlexStartPadding(
flexStartEdge(axis))
: computeEdgeValueForColumn<&Style::padding>(flexStartEdge(axis));
return maxOrDefined(resolveValue(leadingPadding, widthSize).unwrap(), 0.0f);
return maxOrDefined(leadingPadding.resolve(widthSize).unwrap(), 0.0f);
}
float Node::getInlineEndPadding(
@@ -329,7 +328,7 @@ float Node::getInlineEndPadding(
? computeEdgeValueForRow<&Style::padding>(Edge::End, endEdge)
: computeEdgeValueForColumn<&Style::padding>(endEdge);
return maxOrDefined(resolveValue(trailingPadding, widthSize).unwrap(), 0.0f);
return maxOrDefined(trailingPadding.resolve(widthSize).unwrap(), 0.0f);
}
float Node::getFlexEndPadding(
@@ -342,7 +341,7 @@ float Node::getFlexEndPadding(
flexEndEdge(axis))
: computeEdgeValueForColumn<&Style::padding>(flexEndEdge(axis));
return maxOrDefined(resolveValue(trailingPadding, widthSize).unwrap(), 0.0f);
return maxOrDefined(trailingPadding.resolve(widthSize).unwrap(), 0.0f);
}
float Node::getInlineStartPaddingAndBorder(
@@ -393,7 +392,7 @@ float Node::getGapForAxis(FlexDirection axis) const {
auto gap = isRow(axis) ? style_.resolveColumnGap() : style_.resolveRowGap();
// TODO: Validate percentage gap, and expose ability to set percentage to
// public API
return maxOrDefined(resolveValue(gap, 0.0f /*ownerSize*/).unwrap(), 0.0f);
return maxOrDefined(gap.resolve(0.0f /*ownerSize*/).unwrap(), 0.0f);
}
YGSize Node::measure(