C++ style enums 7/N: MeasureMode (#1389)

Summary:
X-link: https://github.com/facebook/react-native/pull/39452

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

This converts usages of YGMeasureMode to MeasureMode

Reviewed By: rozele

Differential Revision: D49271165

fbshipit-source-id: 273c9ed0a61c3965e469548d29d37e4566c974dc
This commit is contained in:
Nick Gerleman
2023-09-14 23:06:34 -07:00
committed by Facebook GitHub Bot
parent 383b325d06
commit ed406f0b55
8 changed files with 181 additions and 180 deletions

View File

@@ -10,6 +10,8 @@
#include <cmath>
#include <yoga/Yoga.h>
#include <yoga/enums/MeasureMode.h>
#include <yoga/numeric/Comparison.h>
namespace facebook::yoga {
@@ -17,8 +19,8 @@ namespace facebook::yoga {
struct CachedMeasurement {
float availableWidth{-1};
float availableHeight{-1};
YGMeasureMode widthMeasureMode{YGMeasureModeUndefined};
YGMeasureMode heightMeasureMode{YGMeasureModeUndefined};
MeasureMode widthMeasureMode{MeasureMode::Undefined};
MeasureMode heightMeasureMode{MeasureMode::Undefined};
float computedWidth{-1};
float computedHeight{-1};

View File

@@ -211,10 +211,11 @@ FloatOptional Node::getGapForAxis(
YGSize Node::measure(
float width,
YGMeasureMode widthMode,
MeasureMode widthMode,
float height,
YGMeasureMode heightMode) {
return measureFunc_(this, width, widthMode, height, heightMode);
MeasureMode heightMode) {
return measureFunc_(
this, width, unscopedEnum(widthMode), height, unscopedEnum(heightMode));
}
float Node::baseline(float width, float height) const {

View File

@@ -15,6 +15,7 @@
#include <yoga/config/Config.h>
#include <yoga/enums/Errata.h>
#include <yoga/enums/MeasureMode.h>
#include <yoga/enums/NodeType.h>
#include <yoga/node/LayoutResults.h>
#include <yoga/style/CompactValue.h>
@@ -102,7 +103,7 @@ class YG_EXPORT Node : public ::YGNode {
return measureFunc_ != nullptr;
}
YGSize measure(float, YGMeasureMode, float, YGMeasureMode);
YGSize measure(float, MeasureMode, float, MeasureMode);
bool hasBaselineFunc() const noexcept {
return baselineFunc_ != nullptr;