status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove rounding from experimental features 

Reviewed By: gkassabli

Differential Revision: D4953838

fbshipit-source-id: 3ee5f27d92f95b3ed4a01c98bc35e9157f2e91c5
This commit is contained in:
Emil Sjolander 2017-04-27 07:09:24 -07:00 committed by Facebook Github Bot
parent 92bf73f689
commit 1a72d91cb2
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
View File

@ -13,9 +13,8 @@ import com.facebook.proguard.annotations.DoNotStrip;
@DoNotStrip
public enum YogaExperimentalFeature {
ROUNDING(0),
WEB_FLEX_BASIS(1),
MIN_FLEX_FIX(2);
WEB_FLEX_BASIS(0),
MIN_FLEX_FIX(1);
private int mIntValue;
@ -29,9 +28,8 @@ public enum YogaExperimentalFeature {
public static YogaExperimentalFeature fromInt(int value) {
switch (value) {
case 0: return ROUNDING;
case 1: return WEB_FLEX_BASIS;
case 2: return MIN_FLEX_FIX;
case 0: return WEB_FLEX_BASIS;
case 1: return MIN_FLEX_FIX;
default: throw new IllegalArgumentException("Unknown enum value: " + value);
}
}

2
ReactCommon/yoga/yoga/YGEnums.c
View File

@ -89,8 +89,6 @@ const char *YGEdgeToString(const YGEdge value){
const char *YGExperimentalFeatureToString(const YGExperimentalFeature value){
switch(value){
case YGExperimentalFeatureRounding:
return "rounding";
case YGExperimentalFeatureWebFlexBasis:
return "web-flex-basis";
case YGExperimentalFeatureMinFlexFix:

3
ReactCommon/yoga/yoga/YGEnums.h
View File

@ -62,9 +62,8 @@ typedef YG_ENUM_BEGIN(YGEdge) {
} YG_ENUM_END(YGEdge);
WIN_EXPORT const char *YGEdgeToString(const YGEdge value);
#define YGExperimentalFeatureCount 3
#define YGExperimentalFeatureCount 2
typedef YG_ENUM_BEGIN(YGExperimentalFeature) {
YGExperimentalFeatureRounding,
YGExperimentalFeatureWebFlexBasis,
YGExperimentalFeatureMinFlexFix,
} YG_ENUM_END(YGExperimentalFeature);

6
ReactCommon/yoga/yoga/Yoga.c
View File

@ -202,7 +202,6 @@ static YGNode gYGNodeDefaults = {
static YGConfig gYGConfigDefaults = {
.experimentalFeatures =
{
[YGExperimentalFeatureRounding] = false,
[YGExperimentalFeatureMinFlexFix] = false,
[YGExperimentalFeatureWebFlexBasis] = false,
},
@ -3386,10 +3385,7 @@ void YGNodeCalculateLayout(const YGNodeRef node,
"initial",
node->config)) {
YGNodeSetPosition(node, node->layout.direction, parentWidth, parentHeight, parentWidth);
if (YGConfigIsExperimentalFeatureEnabled(node->config, YGExperimentalFeatureRounding)) {
YGRoundToPixelGrid(node, node->config->pointScaleFactor, 0.0f, 0.0f);
}
YGRoundToPixelGrid(node, node->config->pointScaleFactor, 0.0f, 0.0f);
if (gPrintTree) {
YGNodePrint(node, YGPrintOptionsLayout | YGPrintOptionsChildren | YGPrintOptionsStyle);