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

C++ style enums 16/N: Dimension (#1403)

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

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

Replaces all usages of YGDimension with Dimension.

Adds `yoga::to_underlying` to act like `std::to_underlying`, added in C++ 23.

This enum is oddly only used internally, and is never an input to the public API, but it handled as any other public generated enum. Potentially some more cleanup to do there.

Changelog: [Internal]

Reviewed By: rshest

Differential Revision: D49475409

fbshipit-source-id: 7d4c31e8a84485baea0dab50b5cf16b86769fa07
This commit is contained in:
Nick Gerleman
2023-09-29 00:06:34 -07:00
committed by Facebook GitHub Bot
parent 8d24fcd90f
commit a8566a0150
12 changed files with 139 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yoga/algorithm/Baseline.cpp
View File

@@ -19,8 +19,8 @@ float calculateBaseline(const yoga::Node* node) {
Event::publish<Event::NodeBaselineStart>(node);
const float baseline = node->baseline(
node->getLayout().measuredDimension(YGDimensionWidth),
node->getLayout().measuredDimension(YGDimensionHeight));
node->getLayout().measuredDimension(Dimension::Width),
node->getLayout().measuredDimension(Dimension::Height));
Event::publish<Event::NodeBaselineEnd>(node);
@@ -53,7 +53,7 @@ float calculateBaseline(const yoga::Node* node) {
}
if (baselineChild == nullptr) {
return node->getLayout().measuredDimension(YGDimensionHeight);
return node->getLayout().measuredDimension(Dimension::Height);
}
const float baseline = calculateBaseline(baselineChild);

9
yoga/algorithm/BoundAxis.h
View File

@@ -9,6 +9,7 @@
#include <yoga/algorithm/FlexDirection.h>
#include <yoga/algorithm/ResolveValue.h>
#include <yoga/enums/Dimension.h>
#include <yoga/enums/FlexDirection.h>
#include <yoga/node/Node.h>
#include <yoga/numeric/Comparison.h>
@@ -35,14 +36,14 @@ inline FloatOptional boundAxisWithinMinAndMax(
if (isColumn(axis)) {
min = yoga::resolveValue(
node->getStyle().minDimension(YGDimensionHeight), axisSize);
node->getStyle().minDimension(Dimension::Height), axisSize);
max = yoga::resolveValue(
node->getStyle().maxDimension(YGDimensionHeight), axisSize);
node->getStyle().maxDimension(Dimension::Height), axisSize);
} else if (isRow(axis)) {
min = yoga::resolveValue(
node->getStyle().minDimension(YGDimensionWidth), axisSize);
node->getStyle().minDimension(Dimension::Width), axisSize);
max = yoga::resolveValue(
node->getStyle().maxDimension(YGDimensionWidth), axisSize);
node->getStyle().maxDimension(Dimension::Width), axisSize);
}
if (max >= FloatOptional{0} && value > max) {

102
yoga/algorithm/CalculateLayout.cpp
View File

@@ -169,7 +169,7 @@ static void computeFlexBasisForChild(
child->setLayoutComputedFlexBasis(yoga::maxOrDefined(
yoga::resolveValue(
child->getResolvedDimension(YGDimensionWidth), ownerWidth),
child->getResolvedDimension(Dimension::Width), ownerWidth),
paddingAndBorder));
} else if (!isMainAxisRow && isColumnStyleDimDefined) {
// The height is definite, so use that as the flex basis.
@@ -177,7 +177,7 @@ static void computeFlexBasisForChild(
paddingAndBorderForAxis(child, FlexDirection::Column, ownerWidth));
child->setLayoutComputedFlexBasis(yoga::maxOrDefined(
yoga::resolveValue(
child->getResolvedDimension(YGDimensionHeight), ownerHeight),
child->getResolvedDimension(Dimension::Height), ownerHeight),
paddingAndBorder));
} else {
// Compute the flex basis and hypothetical main size (i.e. the clamped flex
@@ -195,7 +195,7 @@ static void computeFlexBasisForChild(
if (isRowStyleDimDefined) {
childWidth =
yoga::resolveValue(
child->getResolvedDimension(YGDimensionWidth), ownerWidth)
child->getResolvedDimension(Dimension::Width), ownerWidth)
.unwrap() +
marginRow;
childWidthMeasureMode = MeasureMode::Exactly;
@@ -203,7 +203,7 @@ static void computeFlexBasisForChild(
if (isColumnStyleDimDefined) {
childHeight =
yoga::resolveValue(
child->getResolvedDimension(YGDimensionHeight), ownerHeight)
child->getResolvedDimension(Dimension::Height), ownerHeight)
.unwrap() +
marginColumn;
childHeightMeasureMode = MeasureMode::Exactly;
@@ -341,7 +341,7 @@ static void layoutAbsoluteChild(
if (styleDefinesDimension(child, FlexDirection::Row, width)) {
childWidth =
yoga::resolveValue(child->getResolvedDimension(YGDimensionWidth), width)
yoga::resolveValue(child->getResolvedDimension(Dimension::Width), width)
.unwrap() +
marginRow;
} else {
@@ -349,7 +349,7 @@ static void layoutAbsoluteChild(
// the left/right offsets if they're defined.
if (child->isLeadingPositionDefined(FlexDirection::Row) &&
child->isTrailingPosDefined(FlexDirection::Row)) {
childWidth = node->getLayout().measuredDimension(YGDimensionWidth) -
childWidth = node->getLayout().measuredDimension(Dimension::Width) -
(node->getLeadingBorder(FlexDirection::Row) +
node->getTrailingBorder(FlexDirection::Row)) -
(child->getLeadingPosition(FlexDirection::Row, width) +
@@ -362,7 +362,7 @@ static void layoutAbsoluteChild(
if (styleDefinesDimension(child, FlexDirection::Column, height)) {
childHeight = yoga::resolveValue(
child->getResolvedDimension(YGDimensionHeight), height)
child->getResolvedDimension(Dimension::Height), height)
.unwrap() +
marginColumn;
} else {
@@ -370,7 +370,7 @@ static void layoutAbsoluteChild(
// the top/bottom offsets if they're defined.
if (child->isLeadingPositionDefined(FlexDirection::Column) &&
child->isTrailingPosDefined(FlexDirection::Column)) {
childHeight = node->getLayout().measuredDimension(YGDimensionHeight) -
childHeight = node->getLayout().measuredDimension(Dimension::Height) -
(node->getLeadingBorder(FlexDirection::Column) +
node->getTrailingBorder(FlexDirection::Column)) -
(child->getLeadingPosition(FlexDirection::Column, height) +
@@ -431,9 +431,9 @@ static void layoutAbsoluteChild(
layoutMarkerData,
depth,
generationCount);
childWidth = child->getLayout().measuredDimension(YGDimensionWidth) +
childWidth = child->getLayout().measuredDimension(Dimension::Width) +
child->getMarginForAxis(FlexDirection::Row, width).unwrap();
childHeight = child->getLayout().measuredDimension(YGDimensionHeight) +
childHeight = child->getLayout().measuredDimension(Dimension::Height) +
child->getMarginForAxis(FlexDirection::Column, width).unwrap();
}
@@ -587,7 +587,7 @@ static void measureNodeWithMeasureFunc(
node->setLayoutMeasuredDimension(
boundAxis(
node, FlexDirection::Row, availableWidth, ownerWidth, ownerWidth),
YGDimensionWidth);
Dimension::Width);
node->setLayoutMeasuredDimension(
boundAxis(
node,
@@ -595,7 +595,7 @@ static void measureNodeWithMeasureFunc(
availableHeight,
ownerHeight,
ownerWidth),
YGDimensionHeight);
Dimension::Height);
} else {
Event::publish<Event::MeasureCallbackStart>(node);
@@ -627,7 +627,7 @@ static void measureNodeWithMeasureFunc(
: availableWidth,
ownerWidth,
ownerWidth),
YGDimensionWidth);
Dimension::Width);
node->setLayoutMeasuredDimension(
boundAxis(
@@ -639,7 +639,7 @@ static void measureNodeWithMeasureFunc(
: availableHeight,
ownerHeight,
ownerWidth),
YGDimensionHeight);
Dimension::Height);
}
}
@@ -664,7 +664,7 @@ static void measureNodeWithoutChildren(
}
node->setLayoutMeasuredDimension(
boundAxis(node, FlexDirection::Row, width, ownerWidth, ownerWidth),
YGDimensionWidth);
Dimension::Width);
float height = availableHeight;
if (heightMeasureMode == MeasureMode::Undefined ||
@@ -674,7 +674,7 @@ static void measureNodeWithoutChildren(
}
node->setLayoutMeasuredDimension(
boundAxis(node, FlexDirection::Column, height, ownerHeight, ownerWidth),
YGDimensionHeight);
Dimension::Height);
}
static bool measureNodeWithFixedSize(
@@ -702,7 +702,7 @@ static bool measureNodeWithFixedSize(
: availableWidth,
ownerWidth,
ownerWidth),
YGDimensionWidth);
Dimension::Width);
node->setLayoutMeasuredDimension(
boundAxis(
@@ -715,7 +715,7 @@ static bool measureNodeWithFixedSize(
: availableHeight,
ownerHeight,
ownerWidth),
YGDimensionHeight);
Dimension::Height);
return true;
}
@@ -724,8 +724,8 @@ static bool measureNodeWithFixedSize(
static void zeroOutLayoutRecursively(yoga::Node* const node) {
node->getLayout() = {};
node->setLayoutDimension(0, YGDimensionWidth);
node->setLayoutDimension(0, YGDimensionHeight);
node->setLayoutDimension(0, Dimension::Width);
node->setLayoutDimension(0, Dimension::Height);
node->setHasNewLayout(true);
node->cloneChildrenIfNeeded();
@@ -736,7 +736,7 @@ static void zeroOutLayoutRecursively(yoga::Node* const node) {
static float calculateAvailableInnerDimension(
const yoga::Node* const node,
const YGDimension dimension,
const Dimension dimension,
const float availableDim,
const float paddingAndBorder,
const float ownerDim) {
@@ -1373,7 +1373,7 @@ static void justifyMainAxis(
FlexDirection::Column, availableInnerWidth)
.unwrap();
const float descent =
child->getLayout().measuredDimension(YGDimensionHeight) +
child->getLayout().measuredDimension(Dimension::Height) +
child
->getMarginForAxis(
FlexDirection::Column, availableInnerWidth)
@@ -1632,13 +1632,13 @@ static void calculateLayoutImpl(
float availableInnerWidth = calculateAvailableInnerDimension(
node,
YGDimensionWidth,
Dimension::Width,
availableWidth - marginAxisRow,
paddingAndBorderAxisRow,
ownerWidth);
float availableInnerHeight = calculateAvailableInnerDimension(
node,
YGDimensionHeight,
Dimension::Height,
availableHeight - marginAxisColumn,
paddingAndBorderAxisColumn,
ownerHeight);
@@ -1725,19 +1725,19 @@ static void calculateLayoutImpl(
if (measureModeMainDim != MeasureMode::Exactly) {
const auto& style = node->getStyle();
const float minInnerWidth =
yoga::resolveValue(style.minDimension(YGDimensionWidth), ownerWidth)
yoga::resolveValue(style.minDimension(Dimension::Width), ownerWidth)
.unwrap() -
paddingAndBorderAxisRow;
const float maxInnerWidth =
yoga::resolveValue(style.maxDimension(YGDimensionWidth), ownerWidth)
yoga::resolveValue(style.maxDimension(Dimension::Width), ownerWidth)
.unwrap() -
paddingAndBorderAxisRow;
const float minInnerHeight =
yoga::resolveValue(style.minDimension(YGDimensionHeight), ownerHeight)
yoga::resolveValue(style.minDimension(Dimension::Height), ownerHeight)
.unwrap() -
paddingAndBorderAxisColumn;
const float maxInnerHeight =
yoga::resolveValue(style.maxDimension(YGDimensionHeight), ownerHeight)
yoga::resolveValue(style.maxDimension(Dimension::Height), ownerHeight)
.unwrap() -
paddingAndBorderAxisColumn;
@@ -2089,7 +2089,7 @@ static void calculateLayoutImpl(
FlexDirection::Column, availableInnerWidth)
.unwrap();
const float descent =
child->getLayout().measuredDimension(YGDimensionHeight) +
child->getLayout().measuredDimension(Dimension::Height) +
child
->getMarginForAxis(
FlexDirection::Column, availableInnerWidth)
@@ -2156,14 +2156,14 @@ static void calculateLayoutImpl(
child, crossAxis, availableInnerCrossDim)) {
const float childWidth = isMainAxisRow
? (child->getLayout().measuredDimension(
YGDimensionWidth) +
Dimension::Width) +
child->getMarginForAxis(mainAxis, availableInnerWidth)
.unwrap())
: lineHeight;
const float childHeight = !isMainAxisRow
? (child->getLayout().measuredDimension(
YGDimensionHeight) +
Dimension::Height) +
child->getMarginForAxis(crossAxis, availableInnerWidth)
.unwrap())
: lineHeight;
@@ -2171,11 +2171,11 @@ static void calculateLayoutImpl(
if (!(yoga::inexactEquals(
childWidth,
child->getLayout().measuredDimension(
YGDimensionWidth)) &&
Dimension::Width)) &&
yoga::inexactEquals(
childHeight,
child->getLayout().measuredDimension(
YGDimensionHeight)))) {
Dimension::Height)))) {
calculateLayoutInternal(
child,
childWidth,
@@ -2227,7 +2227,7 @@ static void calculateLayoutImpl(
availableWidth - marginAxisRow,
ownerWidth,
ownerWidth),
YGDimensionWidth);
Dimension::Width);
node->setLayoutMeasuredDimension(
boundAxis(
@@ -2236,7 +2236,7 @@ static void calculateLayoutImpl(
availableHeight - marginAxisColumn,
ownerHeight,
ownerWidth),
YGDimensionHeight);
Dimension::Height);
// If the user didn't specify a width or height for the node, set the
// dimensions based on the children.
@@ -2329,11 +2329,11 @@ static void calculateLayoutImpl(
node,
child,
absolutePercentageAgainstPaddingEdge
? node->getLayout().measuredDimension(YGDimensionWidth)
? node->getLayout().measuredDimension(Dimension::Width)
: availableInnerWidth,
isMainAxisRow ? measureModeMainDim : measureModeCrossDim,
absolutePercentageAgainstPaddingEdge
? node->getLayout().measuredDimension(YGDimensionHeight)
? node->getLayout().measuredDimension(Dimension::Height)
: availableInnerHeight,
direction,
layoutMarkerData,
@@ -2516,9 +2516,9 @@ bool calculateLayoutInternal(
if (!needToVisitNode && cachedResults != nullptr) {
layout->setMeasuredDimension(
YGDimensionWidth, cachedResults->computedWidth);
Dimension::Width, cachedResults->computedWidth);
layout->setMeasuredDimension(
YGDimensionHeight, cachedResults->computedHeight);
Dimension::Height, cachedResults->computedHeight);
(performLayout ? layoutMarkerData.cachedLayouts
: layoutMarkerData.cachedMeasures) += 1;
@@ -2594,8 +2594,8 @@ bool calculateLayoutInternal(
"wm: %s, hm: %s, d: (%f, %f) %s\n",
measureModeName(widthMeasureMode, performLayout),
measureModeName(heightMeasureMode, performLayout),
layout->measuredDimension(YGDimensionWidth),
layout->measuredDimension(YGDimensionHeight),
layout->measuredDimension(Dimension::Width),
layout->measuredDimension(Dimension::Height),
LayoutPassReasonToString(reason));
}
@@ -2630,19 +2630,19 @@ bool calculateLayoutInternal(
newCacheEntry->widthMeasureMode = widthMeasureMode;
newCacheEntry->heightMeasureMode = heightMeasureMode;
newCacheEntry->computedWidth =
layout->measuredDimension(YGDimensionWidth);
layout->measuredDimension(Dimension::Width);
newCacheEntry->computedHeight =
layout->measuredDimension(YGDimensionHeight);
layout->measuredDimension(Dimension::Height);
}
}
if (performLayout) {
node->setLayoutDimension(
node->getLayout().measuredDimension(YGDimensionWidth),
YGDimensionWidth);
node->getLayout().measuredDimension(Dimension::Width),
Dimension::Width);
node->setLayoutDimension(
node->getLayout().measuredDimension(YGDimensionHeight),
YGDimensionHeight);
node->getLayout().measuredDimension(Dimension::Height),
Dimension::Height);
node->setHasNewLayout(true);
node->setDirty(false);
@@ -2688,9 +2688,9 @@ void calculateLayout(
.unwrap();
widthMeasureMode = MeasureMode::Exactly;
} else if (!yoga::resolveValue(
style.maxDimension(YGDimensionWidth), ownerWidth)
style.maxDimension(Dimension::Width), ownerWidth)
.isUndefined()) {
width = yoga::resolveValue(style.maxDimension(YGDimensionWidth), ownerWidth)
width = yoga::resolveValue(style.maxDimension(Dimension::Width), ownerWidth)
.unwrap();
widthMeasureMode = MeasureMode::AtMost;
} else {
@@ -2709,10 +2709,10 @@ void calculateLayout(
.unwrap();
heightMeasureMode = MeasureMode::Exactly;
} else if (!yoga::resolveValue(
style.maxDimension(YGDimensionHeight), ownerHeight)
style.maxDimension(Dimension::Height), ownerHeight)
.isUndefined()) {
height =
yoga::resolveValue(style.maxDimension(YGDimensionHeight), ownerHeight)
yoga::resolveValue(style.maxDimension(Dimension::Height), ownerHeight)
.unwrap();
heightMeasureMode = MeasureMode::AtMost;
} else {

11
yoga/algorithm/FlexDirection.h
View File

@@ -10,6 +10,7 @@
#include <yoga/Yoga.h>
#include <yoga/debug/AssertFatal.h>
#include <yoga/enums/Dimension.h>
#include <yoga/enums/FlexDirection.h>
namespace facebook::yoga {
@@ -76,16 +77,16 @@ inline YGEdge trailingEdge(const FlexDirection flexDirection) {
fatalWithMessage("Invalid FlexDirection");
}
inline YGDimension dimension(const FlexDirection flexDirection) {
inline Dimension dimension(const FlexDirection flexDirection) {
switch (flexDirection) {
case FlexDirection::Column:
return YGDimensionHeight;
return Dimension::Height;
case FlexDirection::ColumnReverse:
return YGDimensionHeight;
return Dimension::Height;
case FlexDirection::Row:
return YGDimensionWidth;
return Dimension::Width;
case FlexDirection::RowReverse:
return YGDimensionWidth;
return Dimension::Width;
}
fatalWithMessage("Invalid FlexDirection");

8
yoga/algorithm/PixelGrid.cpp
View File

@@ -71,8 +71,8 @@ void roundLayoutResultsToPixelGrid(
const double nodeLeft = node->getLayout().position[YGEdgeLeft];
const double nodeTop = node->getLayout().position[YGEdgeTop];
const double nodeWidth = node->getLayout().dimension(YGDimensionWidth);
const double nodeHeight = node->getLayout().dimension(YGDimensionHeight);
const double nodeWidth = node->getLayout().dimension(Dimension::Width);
const double nodeHeight = node->getLayout().dimension(Dimension::Height);
const double absoluteNodeLeft = absoluteLeft + nodeLeft;
const double absoluteNodeTop = absoluteTop + nodeTop;
@@ -111,7 +111,7 @@ void roundLayoutResultsToPixelGrid(
(textRounding && !hasFractionalWidth)) -
roundValueToPixelGrid(
absoluteNodeLeft, pointScaleFactor, false, textRounding),
YGDimensionWidth);
Dimension::Width);
node->setLayoutDimension(
roundValueToPixelGrid(
@@ -121,7 +121,7 @@ void roundLayoutResultsToPixelGrid(
(textRounding && !hasFractionalHeight)) -
roundValueToPixelGrid(
absoluteNodeTop, pointScaleFactor, false, textRounding),
YGDimensionHeight);
Dimension::Height);
}
for (yoga::Node* child : node->getChildren()) {