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

C++ style enums 11/N: Align (#1395)

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

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

Moves internal usages of YGAlign to Align

bypass-github-export-checks

Changelog: [Internal]

Reviewed By: rshest

Differential Revision: D49337511

fbshipit-source-id: bb9906fcd22780d2cfd8d1360ef69f66b9701bb6
This commit is contained in:
Nick Gerleman
2023-09-19 16:30:02 -07:00
committed by Facebook GitHub Bot
parent 61763e7d0a
commit 5bf81b1ef8
8 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
yoga/style/Style.h
View File

@@ -15,6 +15,7 @@
#include <yoga/Yoga.h>
#include <yoga/bits/NumericBitfield.h>
#include <yoga/enums/Align.h>
#include <yoga/enums/Direction.h>
#include <yoga/enums/FlexDirection.h>
#include <yoga/enums/Justify.h>
@@ -95,8 +96,8 @@ class YG_EXPORT Style {
};
Style() {
alignContent() = YGAlignFlexStart;
alignItems() = YGAlignStretch;
alignContent() = Align::FlexStart;
alignItems() = Align::Stretch;
}
~Style() = default;
@@ -109,11 +110,11 @@ class YG_EXPORT Style {
static constexpr uint8_t alignContentOffset =
justifyContentOffset + minimumBitCount<Justify>();
static constexpr uint8_t alignItemsOffset =
alignContentOffset + minimumBitCount<YGAlign>();
alignContentOffset + minimumBitCount<Align>();
static constexpr uint8_t alignSelfOffset =
alignItemsOffset + minimumBitCount<YGAlign>();
alignItemsOffset + minimumBitCount<Align>();
static constexpr uint8_t positionTypeOffset =
alignSelfOffset + minimumBitCount<YGAlign>();
alignSelfOffset + minimumBitCount<Align>();
static constexpr uint8_t flexWrapOffset =
positionTypeOffset + minimumBitCount<YGPositionType>();
static constexpr uint8_t overflowOffset =
@@ -163,24 +164,24 @@ class YG_EXPORT Style {
return {*this, justifyContentOffset};
}
YGAlign alignContent() const {
return getEnumData<YGAlign>(flags, alignContentOffset);
Align alignContent() const {
return getEnumData<Align>(flags, alignContentOffset);
}
BitfieldRef<YGAlign> alignContent() {
BitfieldRef<Align> alignContent() {
return {*this, alignContentOffset};
}
YGAlign alignItems() const {
return getEnumData<YGAlign>(flags, alignItemsOffset);
Align alignItems() const {
return getEnumData<Align>(flags, alignItemsOffset);
}
BitfieldRef<YGAlign> alignItems() {
BitfieldRef<Align> alignItems() {
return {*this, alignItemsOffset};
}
YGAlign alignSelf() const {
return getEnumData<YGAlign>(flags, alignSelfOffset);
Align alignSelf() const {
return getEnumData<Align>(flags, alignSelfOffset);
}
BitfieldRef<YGAlign> alignSelf() {
BitfieldRef<Align> alignSelf() {
return {*this, alignSelfOffset};
}