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

Revert D13866122: Fix negative value rounding issue for nodes across an axis

Browse Source 
Differential Revision:
D13866122 (4266409934)

Original commit changeset: 4faf8a9efc86

Original Phabricator Diff: D13866122 (4266409934)

fbshipit-source-id: c11919fdd585f09b0422e8db55a8a3d66027676f
This commit is contained in:
Eric Rozell
2023-02-02 14:04:12 -08:00
committed by Facebook GitHub Bot
parent 4266409934
commit 996267dbcb
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/YGRoundingFunctionTest.cpp
View File

@@ -80,26 +80,3 @@ TEST(YogaTest, consistent_rounding_during_repeated_layouts) {
YGConfigFree(config); YGConfigFree(config);
} }
// Regression test for https://github.com/facebook/yoga/issues/683
TEST(YogaTest, negative_value_rounding) {
const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
const YGNodeRef child = YGNodeNewWithConfig(config);
YGNodeInsertChild(root, child, 0);
YGNodeStyleSetWidth(child, 10);
YGNodeStyleSetHeight(child, 10);
YGNodeStyleSetPosition(root, YGEdgeLeft, -0.75f);
YGNodeStyleSetPosition(root, YGEdgeTop, -0.75f);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(YGNodeLayoutGetWidth(child), 10);
ASSERT_FLOAT_EQ(YGNodeLayoutGetHeight(child), 10);
YGNodeFreeRecursive(root);
YGConfigFree(config);
}

10
yoga/Yoga.cpp
View File

@@ -3701,12 +3701,16 @@ YOGA_EXPORT float YGRoundValueToPixelGrid(
scaledValue = scaledValue - fractial + 1.0; scaledValue = scaledValue - fractial + 1.0;
} else if (forceCeil) { } else if (forceCeil) {
// Next we check if we need to use forced rounding // Next we check if we need to use forced rounding
scaledValue = ceil(scaledValue); scaledValue = scaledValue - fractial + 1.0;
} else if (forceFloor) { } else if (forceFloor) {
scaledValue = floor(scaledValue); scaledValue = scaledValue - fractial;
} else { } else {
// Finally we just round the value // Finally we just round the value
scaledValue = round(scaledValue); scaledValue = scaledValue - fractial +
(!YGDoubleIsUndefined(fractial) &&
(fractial > 0.5 || YGDoubleEqual(fractial, 0.5))
? 1.0
: 0.0);
} }
return (YGDoubleIsUndefined(scaledValue) || return (YGDoubleIsUndefined(scaledValue) ||
YGDoubleIsUndefined(pointScaleFactor)) YGDoubleIsUndefined(pointScaleFactor))