Skip to content

Commit

Permalink
C++ style enums 17/N: Gutter (#1407)
Browse files Browse the repository at this point in the history
Summary:
X-link: facebook/react-native#39599

Pull Request resolved: #1407

Replaces internal usages of YGGutter with Gutter.

Changelog: [Internal]

Reviewed By: rshest

Differential Revision: D49532100

fbshipit-source-id: 53c1d23e23a9db7294c66b6dc0eaff4e62ff278c
  • Loading branch information
NickGerleman authored and facebook-github-bot committed Oct 5, 2023
1 parent 98d2172 commit f700e13
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 17 deletions.
5 changes: 3 additions & 2 deletions yoga/Yoga.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -635,11 +635,12 @@ void YGNodeStyleSetGap(
const YGGutter gutter,
const float gapLength) {
auto length = CompactValue::ofMaybe<YGUnitPoint>(gapLength);
updateIndexedStyleProp<&Style::gap, &Style::setGap>(node, gutter, length);
updateIndexedStyleProp<&Style::gap, &Style::setGap>(
node, scopedEnum(gutter), length);
}

float YGNodeStyleGetGap(const YGNodeConstRef node, const YGGutter gutter) {
auto gapLength = resolveRef(node)->getStyle().gap(gutter);
auto gapLength = resolveRef(node)->getStyle().gap(scopedEnum(gutter));
if (gapLength.isUndefined() || gapLength.isAuto()) {
return YGUndefined;
}
Expand Down
8 changes: 4 additions & 4 deletions yoga/debug/NodeToString.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ void nodeToString(
appendEdges(str, "padding", style.padding());
appendEdges(str, "border", style.border());

if (!style.gap(YGGutterAll).isUndefined()) {
appendNumberIfNotUndefined(str, "gap", style.gap(YGGutterAll));
if (!style.gap(Gutter::All).isUndefined()) {
appendNumberIfNotUndefined(str, "gap", style.gap(Gutter::All));
} else {
appendNumberIfNotUndefined(str, "column-gap", style.gap(YGGutterColumn));
appendNumberIfNotUndefined(str, "row-gap", style.gap(YGGutterRow));
appendNumberIfNotUndefined(str, "column-gap", style.gap(Gutter::Column));
appendNumberIfNotUndefined(str, "row-gap", style.gap(Gutter::Row));
}

appendNumberIfNotAuto(str, "width", style.dimension(Dimension::Width));
Expand Down
23 changes: 12 additions & 11 deletions yoga/style/Style.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <yoga/enums/Direction.h>
#include <yoga/enums/Display.h>
#include <yoga/enums/FlexDirection.h>
#include <yoga/enums/Gutter.h>
#include <yoga/enums/Justify.h>
#include <yoga/enums/Overflow.h>
#include <yoga/enums/PositionType.h>
Expand All @@ -36,7 +37,7 @@ class YG_EXPORT Style {
public:
using Dimensions = Values<Dimension>;
using Edges = Values<YGEdge>;
using Gutters = Values<YGGutter>;
using Gutters = Values<Gutter>;

static constexpr float DefaultFlexGrow = 0.0f;
static constexpr float DefaultFlexShrink = 0.0f;
Expand Down Expand Up @@ -274,11 +275,11 @@ class YG_EXPORT Style {
return {*this};
}

CompactValue gap(YGGutter gutter) const {
return gap_[gutter];
CompactValue gap(Gutter gutter) const {
return gap_[yoga::to_underlying(gutter)];
}
void setGap(YGGutter gutter, CompactValue value) {
gap_[gutter] = value;
void setGap(Gutter gutter, CompactValue value) {
gap_[yoga::to_underlying(gutter)] = value;
}

CompactValue dimension(Dimension axis) const {
Expand Down Expand Up @@ -311,18 +312,18 @@ class YG_EXPORT Style {
}

CompactValue resolveColumnGap() const {
if (!gap_[YGGutterColumn].isUndefined()) {
return gap_[YGGutterColumn];
if (!gap_[yoga::to_underlying(Gutter::Column)].isUndefined()) {
return gap_[yoga::to_underlying(Gutter::Column)];
} else {
return gap_[YGGutterAll];
return gap_[yoga::to_underlying(Gutter::All)];
}
}

CompactValue resolveRowGap() const {
if (!gap_[YGGutterRow].isUndefined()) {
return gap_[YGGutterRow];
if (!gap_[yoga::to_underlying(Gutter::Row)].isUndefined()) {
return gap_[yoga::to_underlying(Gutter::Row)];
} else {
return gap_[YGGutterAll];
return gap_[yoga::to_underlying(Gutter::All)];
}
}

Expand Down

0 comments on commit f700e13

Please sign in to comment.