diff --git a/src/Layout-test-utils.c b/src/Layout-test-utils.c index de88514a..6a28f1f4 100644 --- a/src/Layout-test-utils.c +++ b/src/Layout-test-utils.c @@ -11,11 +11,11 @@ #include /** START_GENERATED **/ -#define SMALL_WIDTH 34.671875 +#define SMALL_WIDTH 35 #define SMALL_HEIGHT 18 -#define BIG_WIDTH 172.421875 -#define BIG_HEIGHT 36 -#define BIG_MIN_WIDTH 100.4375 +#define BIG_WIDTH 172 +#define BIG_HEIGHT 37 +#define BIG_MIN_WIDTH 100 #define SMALL_TEXT "small" #define LONG_TEXT "loooooooooong with space" /** END_GENERATED **/ diff --git a/src/__tests__/Layout-test.c b/src/__tests__/Layout-test.c index c1bb8ff5..16e7ea65 100644 --- a/src/__tests__/Layout-test.c +++ b/src/__tests__/Layout-test.c @@ -2483,7 +2483,7 @@ int main() css_node_t *node_0 = root_layout; node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; - node_0->layout.dimensions[CSS_WIDTH] = 34.671875; + node_0->layout.dimensions[CSS_WIDTH] = 35; node_0->layout.dimensions[CSS_HEIGHT] = 18; } @@ -2524,7 +2524,7 @@ int main() css_node_t *node_0 = root_layout; node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; - node_0->layout.dimensions[CSS_WIDTH] = 172.421875; + node_0->layout.dimensions[CSS_WIDTH] = 172; node_0->layout.dimensions[CSS_HEIGHT] = 18; } @@ -2658,7 +2658,7 @@ int main() node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; node_0->layout.dimensions[CSS_WIDTH] = 130; - node_0->layout.dimensions[CSS_HEIGHT] = 36; + node_0->layout.dimensions[CSS_HEIGHT] = 37; init_css_node_children(node_0, 1); { css_node_t *node_1; @@ -2666,7 +2666,7 @@ int main() node_1->layout.position[CSS_TOP] = 0; node_1->layout.position[CSS_LEFT] = 0; node_1->layout.dimensions[CSS_WIDTH] = 130; - node_1->layout.dimensions[CSS_HEIGHT] = 36; + node_1->layout.dimensions[CSS_HEIGHT] = 37; init_css_node_children(node_1, 1); { css_node_t *node_2; @@ -2674,7 +2674,7 @@ int main() node_2->layout.position[CSS_TOP] = 0; node_2->layout.position[CSS_LEFT] = 0; node_2->layout.dimensions[CSS_WIDTH] = 130; - node_2->layout.dimensions[CSS_HEIGHT] = 36; + node_2->layout.dimensions[CSS_HEIGHT] = 37; } } } @@ -2710,7 +2710,7 @@ int main() node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; node_0->layout.dimensions[CSS_WIDTH] = 200; - node_0->layout.dimensions[CSS_HEIGHT] = 36; + node_0->layout.dimensions[CSS_HEIGHT] = 37; init_css_node_children(node_0, 1); { css_node_t *node_1; @@ -2718,7 +2718,7 @@ int main() node_1->layout.position[CSS_TOP] = 0; node_1->layout.position[CSS_LEFT] = 0; node_1->layout.dimensions[CSS_WIDTH] = 200; - node_1->layout.dimensions[CSS_HEIGHT] = 36; + node_1->layout.dimensions[CSS_HEIGHT] = 37; init_css_node_children(node_1, 1); { css_node_t *node_2; @@ -2726,7 +2726,7 @@ int main() node_2->layout.position[CSS_TOP] = 0; node_2->layout.position[CSS_LEFT] = 0; node_2->layout.dimensions[CSS_WIDTH] = 130; - node_2->layout.dimensions[CSS_HEIGHT] = 36; + node_2->layout.dimensions[CSS_HEIGHT] = 37; } } } @@ -2756,15 +2756,15 @@ int main() node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; node_0->layout.dimensions[CSS_WIDTH] = 100; - node_0->layout.dimensions[CSS_HEIGHT] = 36; + node_0->layout.dimensions[CSS_HEIGHT] = 37; init_css_node_children(node_0, 1); { css_node_t *node_1; node_1 = node_0->get_child(node_0->context, 0); node_1->layout.position[CSS_TOP] = 0; node_1->layout.position[CSS_LEFT] = 0; - node_1->layout.dimensions[CSS_WIDTH] = 100.4375; - node_1->layout.dimensions[CSS_HEIGHT] = 36; + node_1->layout.dimensions[CSS_WIDTH] = 100; + node_1->layout.dimensions[CSS_HEIGHT] = 37; } } @@ -2806,23 +2806,23 @@ int main() node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; node_0->layout.dimensions[CSS_WIDTH] = 100; - node_0->layout.dimensions[CSS_HEIGHT] = 76; + node_0->layout.dimensions[CSS_HEIGHT] = 77; init_css_node_children(node_0, 1); { css_node_t *node_1; node_1 = node_0->get_child(node_0->context, 0); node_1->layout.position[CSS_TOP] = 20; node_1->layout.position[CSS_LEFT] = 20; - node_1->layout.dimensions[CSS_WIDTH] = 100.4375; - node_1->layout.dimensions[CSS_HEIGHT] = 36; + node_1->layout.dimensions[CSS_WIDTH] = 100; + node_1->layout.dimensions[CSS_HEIGHT] = 37; init_css_node_children(node_1, 1); { css_node_t *node_2; node_2 = node_1->get_child(node_1->context, 0); node_2->layout.position[CSS_TOP] = 0; node_2->layout.position[CSS_LEFT] = 0; - node_2->layout.dimensions[CSS_WIDTH] = 100.4375; - node_2->layout.dimensions[CSS_HEIGHT] = 36; + node_2->layout.dimensions[CSS_WIDTH] = 100; + node_2->layout.dimensions[CSS_HEIGHT] = 37; } } } @@ -2952,7 +2952,7 @@ int main() node_2 = node_1->get_child(node_1->context, 0); node_2->layout.position[CSS_TOP] = 20; node_2->layout.position[CSS_LEFT] = 20; - node_2->layout.dimensions[CSS_WIDTH] = 172.421875; + node_2->layout.dimensions[CSS_WIDTH] = 172; node_2->layout.dimensions[CSS_HEIGHT] = 18; } } @@ -2990,7 +2990,7 @@ int main() node_0->layout.position[CSS_TOP] = 0; node_0->layout.position[CSS_LEFT] = 0; node_0->layout.dimensions[CSS_WIDTH] = 200; - node_0->layout.dimensions[CSS_HEIGHT] = 76; + node_0->layout.dimensions[CSS_HEIGHT] = 77; init_css_node_children(node_0, 1); { css_node_t *node_1; @@ -2998,7 +2998,7 @@ int main() node_1->layout.position[CSS_TOP] = 0; node_1->layout.position[CSS_LEFT] = 0; node_1->layout.dimensions[CSS_WIDTH] = 200; - node_1->layout.dimensions[CSS_HEIGHT] = 76; + node_1->layout.dimensions[CSS_HEIGHT] = 77; init_css_node_children(node_1, 1); { css_node_t *node_2; @@ -3006,7 +3006,7 @@ int main() node_2->layout.position[CSS_TOP] = 20; node_2->layout.position[CSS_LEFT] = 20; node_2->layout.dimensions[CSS_WIDTH] = 160; - node_2->layout.dimensions[CSS_HEIGHT] = 36; + node_2->layout.dimensions[CSS_HEIGHT] = 37; } } } diff --git a/src/java/tests/com/facebook/csslayout/LayoutEngineTest.java b/src/java/tests/com/facebook/csslayout/LayoutEngineTest.java index ce0e890c..296fa608 100644 --- a/src/java/tests/com/facebook/csslayout/LayoutEngineTest.java +++ b/src/java/tests/com/facebook/csslayout/LayoutEngineTest.java @@ -2686,7 +2686,7 @@ public class LayoutEngineTest { TestCSSNode node_0 = root_layout; node_0.layout.y = 0; node_0.layout.x = 0; - node_0.layout.width = 34.671875f; + node_0.layout.width = 35; node_0.layout.height = 18; } @@ -2731,7 +2731,7 @@ public class LayoutEngineTest { TestCSSNode node_0 = root_layout; node_0.layout.y = 0; node_0.layout.x = 0; - node_0.layout.width = 172.421875f; + node_0.layout.width = 172; node_0.layout.height = 18; } @@ -2871,7 +2871,7 @@ public class LayoutEngineTest { node_0.layout.y = 0; node_0.layout.x = 0; node_0.layout.width = 130; - node_0.layout.height = 36; + node_0.layout.height = 37; addChildren(node_0, 1); { TestCSSNode node_1; @@ -2879,7 +2879,7 @@ public class LayoutEngineTest { node_1.layout.y = 0; node_1.layout.x = 0; node_1.layout.width = 130; - node_1.layout.height = 36; + node_1.layout.height = 37; addChildren(node_1, 1); { TestCSSNode node_2; @@ -2887,7 +2887,7 @@ public class LayoutEngineTest { node_2.layout.y = 0; node_2.layout.x = 0; node_2.layout.width = 130; - node_2.layout.height = 36; + node_2.layout.height = 37; } } } @@ -2925,7 +2925,7 @@ public class LayoutEngineTest { node_0.layout.y = 0; node_0.layout.x = 0; node_0.layout.width = 200; - node_0.layout.height = 36; + node_0.layout.height = 37; addChildren(node_0, 1); { TestCSSNode node_1; @@ -2933,7 +2933,7 @@ public class LayoutEngineTest { node_1.layout.y = 0; node_1.layout.x = 0; node_1.layout.width = 200; - node_1.layout.height = 36; + node_1.layout.height = 37; addChildren(node_1, 1); { TestCSSNode node_2; @@ -2941,7 +2941,7 @@ public class LayoutEngineTest { node_2.layout.y = 0; node_2.layout.x = 0; node_2.layout.width = 130; - node_2.layout.height = 36; + node_2.layout.height = 37; } } } @@ -2973,15 +2973,15 @@ public class LayoutEngineTest { node_0.layout.y = 0; node_0.layout.x = 0; node_0.layout.width = 100; - node_0.layout.height = 36; + node_0.layout.height = 37; addChildren(node_0, 1); { TestCSSNode node_1; node_1 = node_0.getChildAt(0); node_1.layout.y = 0; node_1.layout.x = 0; - node_1.layout.width = 100.4375f; - node_1.layout.height = 36; + node_1.layout.width = 100; + node_1.layout.height = 37; } } @@ -3025,23 +3025,23 @@ public class LayoutEngineTest { node_0.layout.y = 0; node_0.layout.x = 0; node_0.layout.width = 100; - node_0.layout.height = 76; + node_0.layout.height = 77; addChildren(node_0, 1); { TestCSSNode node_1; node_1 = node_0.getChildAt(0); node_1.layout.y = 20; node_1.layout.x = 20; - node_1.layout.width = 100.4375f; - node_1.layout.height = 36; + node_1.layout.width = 100; + node_1.layout.height = 37; addChildren(node_1, 1); { TestCSSNode node_2; node_2 = node_1.getChildAt(0); node_2.layout.y = 0; node_2.layout.x = 0; - node_2.layout.width = 100.4375f; - node_2.layout.height = 36; + node_2.layout.width = 100; + node_2.layout.height = 37; } } } @@ -3177,7 +3177,7 @@ public class LayoutEngineTest { node_2 = node_1.getChildAt(0); node_2.layout.y = 20; node_2.layout.x = 20; - node_2.layout.width = 172.421875f; + node_2.layout.width = 172; node_2.layout.height = 18; } } @@ -3217,7 +3217,7 @@ public class LayoutEngineTest { node_0.layout.y = 0; node_0.layout.x = 0; node_0.layout.width = 200; - node_0.layout.height = 76; + node_0.layout.height = 77; addChildren(node_0, 1); { TestCSSNode node_1; @@ -3225,7 +3225,7 @@ public class LayoutEngineTest { node_1.layout.y = 0; node_1.layout.x = 0; node_1.layout.width = 200; - node_1.layout.height = 76; + node_1.layout.height = 77; addChildren(node_1, 1); { TestCSSNode node_2; @@ -3233,7 +3233,7 @@ public class LayoutEngineTest { node_2.layout.y = 20; node_2.layout.x = 20; node_2.layout.width = 160; - node_2.layout.height = 36; + node_2.layout.height = 37; } } } diff --git a/src/java/tests/com/facebook/csslayout/TestConstants.java b/src/java/tests/com/facebook/csslayout/TestConstants.java index 3332e1e6..6ca0d1b3 100644 --- a/src/java/tests/com/facebook/csslayout/TestConstants.java +++ b/src/java/tests/com/facebook/csslayout/TestConstants.java @@ -14,11 +14,11 @@ package com.facebook.csslayout; public class TestConstants { /** START_GENERATED **/ - public static final float SMALL_WIDTH = 34.671875f; + public static final float SMALL_WIDTH = 35f; public static final float SMALL_HEIGHT = 18f; - public static final float BIG_WIDTH = 172.421875f; - public static final float BIG_HEIGHT = 36f; - public static final float BIG_MIN_WIDTH = 100.4375f; + public static final float BIG_WIDTH = 172f; + public static final float BIG_HEIGHT = 37f; + public static final float BIG_MIN_WIDTH = 100f; public static final String SMALL_TEXT = "small"; public static final String LONG_TEXT = "loooooooooong with space"; /** END_GENERATED **/