sync up to facebook/yoga@f45059e

Author: kjk

Diff for: README.md

@@ -22,4 +22,4 @@ The port is finished. The code works and passess all Yoga tests.
 
 The API is awkward by Go standards but it's the best I could do given that I want to stay close to C version.
 
-Logic is currently synced up to  https://github.com/facebook/yoga/commit/c9384762ee367f890a3de57ff3270d8f9c445866
+Logic is currently synced up to  https://github.com/facebook/yoga/commit/f45059e1e696727c1282742b89d2c8bf06345254

Diff for: rounding_function_test.go

@@ -0,0 +1,22 @@
+package flex
+
+import "testing"
+
+func TestRounding_value(t *testing.T) {
+
+	// Test that whole numbers are rounded to whole despite ceil/floor flags
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(6.000001, 2.0, false, false))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(6.000001, 2.0, true, false))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(6.000001, 2.0, false, true))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(5.999999, 2.0, false, false))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(5.999999, 2.0, true, false))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(5.999999, 2.0, false, true))
+
+	// Test that numbers with fraction are rounded correctly accounting for ceil/floor flags
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(6.01, 2.0, false, false))
+	assertFloatEqual(t, 6.5, roundValueToPixelGrid(6.01, 2.0, true, false))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(6.01, 2.0, false, true))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(5.99, 2.0, false, false))
+	assertFloatEqual(t, 6.0, roundValueToPixelGrid(5.99, 2.0, true, false))
+	assertFloatEqual(t, 5.5, roundValueToPixelGrid(5.99, 2.0, false, true))
+}

Diff for: yoga.go

@@ -2655,13 +2655,17 @@ func roundValueToPixelGrid(value float32, pointScaleFactor float32, forceCeil bo
 	scaledValue := value * pointScaleFactor
 	fractial := fmodf(scaledValue, 1.0)
 	if FloatsEqual(fractial, 0) {
-		// Still remove fractial as fractial could be  extremely small.
+		// First we check if the value is already rounded
 		scaledValue = scaledValue - fractial
+	} else if FloatsEqual(fractial, 1.0) {
+		scaledValue = scaledValue - fractial + 1.0
 	} else if forceCeil {
+		// Next we check if we need to use forced rounding
 		scaledValue = scaledValue - fractial + 1.0
 	} else if forceFloor {
 		scaledValue = scaledValue - fractial
 	} else {
+		// Finally we just round the value
 		var f float32
 		if fractial >= 0.5 {
 			f = 1.0