diff --git a/YogaKit/Source/UIView+Yoga.h b/YogaKit/Source/UIView+Yoga.h index 70e91917..1af3581b 100644 --- a/YogaKit/Source/UIView+Yoga.h +++ b/YogaKit/Source/UIView+Yoga.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import #import "YGLayout.h" +#import @interface UIView (Yoga) diff --git a/YogaKit/Source/YGLayout.h b/YogaKit/Source/YGLayout.h index 6b8ded62..3052b439 100644 --- a/YogaKit/Source/YGLayout.h +++ b/YogaKit/Source/YGLayout.h @@ -18,7 +18,8 @@ @property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout; /** - The property that decides during layout/sizing whether or not styling properties should be applied. Defaults to NO. + The property that decides during layout/sizing whether or not styling properties should be applied. + Defaults to NO. */ @property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled; @@ -84,7 +85,7 @@ /** Get the resolved direction of this node. This won't be YGDirectionInherit */ - @property (nonatomic, readonly, assign) YGDirection resolvedDirection; +@property (nonatomic, readonly, assign) YGDirection resolvedDirection; /** Perform a layout calculation and update the frames of the views in the hierarchy with the results @@ -92,19 +93,21 @@ - (void)applyLayout NS_SWIFT_NAME(applyLayout()); /** - Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)]; + Returns the size of the view if no constraints were given. This could equivalent to calling [self + sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)]; */ - @property (nonatomic, readonly, assign) CGSize intrinsicSize; +@property (nonatomic, readonly, assign) CGSize intrinsicSize; /** Returns the number of children that are using Flexbox. */ - @property (nonatomic, readonly, assign) NSUInteger numberOfChildren; +@property (nonatomic, readonly, assign) NSUInteger numberOfChildren; /** - Return a BOOL indiciating whether or not we this node contains any subviews that are included in Yoga's layout. + Return a BOOL indiciating whether or not we this node contains any subviews that are included in + Yoga's layout. */ - @property (nonatomic, readonly, assign) BOOL isLeaf; +@property (nonatomic, readonly, assign) BOOL isLeaf; /** Mark that a view's layout needs to be recalculated. Only works for leaf views. diff --git a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h b/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h index dd7af882..39858917 100644 --- a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h +++ b/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h @@ -13,4 +13,3 @@ @property (strong, nonatomic) UIWindow *window; @end - diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewController.h b/YogaKit/YogaKitSample/YogaKitSample/ViewController.h index f5642871..dbea50e0 100644 --- a/YogaKit/YogaKitSample/YogaKitSample/ViewController.h +++ b/YogaKit/YogaKitSample/YogaKitSample/ViewController.h @@ -10,6 +10,4 @@ @interface ViewController : UIViewController - @end - diff --git a/benchmark/YGBenchmark.c b/benchmark/YGBenchmark.c index 2e816359..b3537491 100644 --- a/benchmark/YGBenchmark.c +++ b/benchmark/YGBenchmark.c @@ -12,10 +12,10 @@ #include static YGSize _measure(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { return (YGSize){ .width = widthMode == YGMeasureModeUndefined ? 10 : width, .height = heightMode == YGMeasureModeUndefined ? 10 : width, diff --git a/benchmark/YGBenchmark.h b/benchmark/YGBenchmark.h index 4ebd2841..af8fb9de 100644 --- a/benchmark/YGBenchmark.h +++ b/benchmark/YGBenchmark.h @@ -17,7 +17,7 @@ #define NUM_REPETITIONS 1000 -#define YGBENCHMARKS(BLOCK) \ +#define YGBENCHMARKS(BLOCK) \ int main(int argc, char const *argv[]) { \ clock_t __start; \ clock_t __endTimes[NUM_REPETITIONS]; \ @@ -25,7 +25,7 @@ return 0; \ } -#define YGBENCHMARK(NAME, BLOCK) \ +#define YGBENCHMARK(NAME, BLOCK) \ __start = clock(); \ for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \ { BLOCK } \ diff --git a/csharp/Yoga/dllmain.cpp b/csharp/Yoga/dllmain.cpp index d911b341..2cd9597b 100644 --- a/csharp/Yoga/dllmain.cpp +++ b/csharp/Yoga/dllmain.cpp @@ -10,18 +10,13 @@ // dllmain.cpp : Defines the entry point for the DLL application. #include "stdafx.h" -BOOL APIENTRY DllMain( HMODULE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) -{ - switch (ul_reason_for_call) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - case DLL_PROCESS_DETACH: - break; - } - return TRUE; +BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { + switch (ul_reason_for_call) { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + case DLL_THREAD_DETACH: + case DLL_PROCESS_DETACH: + break; + } + return TRUE; } diff --git a/csharp/Yoga/resource.h b/csharp/Yoga/resource.h index 36cc8c0e..3a28c6f4 100644 --- a/csharp/Yoga/resource.h +++ b/csharp/Yoga/resource.h @@ -6,9 +6,9 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/csharp/Yoga/stdafx.h b/csharp/Yoga/stdafx.h index 1984e9a0..40e16788 100644 --- a/csharp/Yoga/stdafx.h +++ b/csharp/Yoga/stdafx.h @@ -16,10 +16,8 @@ #include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers // Windows Header Files: #include - - // TODO: reference additional headers your program requires here diff --git a/tests/YGAspectRatioTest.cpp b/tests/YGAspectRatioTest.cpp index fe7c53b0..7642ac23 100644 --- a/tests/YGAspectRatioTest.cpp +++ b/tests/YGAspectRatioTest.cpp @@ -7,15 +7,15 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include static YGSize _measure(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - return YGSize { + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { + return YGSize{ .width = widthMode == YGMeasureModeExactly ? width : 50, .height = heightMode == YGMeasureModeExactly ? height : 50, }; diff --git a/tests/YGComputedMarginTest.cpp b/tests/YGComputedMarginTest.cpp index f7d258e7..c123c819 100644 --- a/tests/YGComputedMarginTest.cpp +++ b/tests/YGComputedMarginTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, computed_layout_margin) { const YGNodeRef root = YGNodeNew(); diff --git a/tests/YGComputedPaddingTest.cpp b/tests/YGComputedPaddingTest.cpp index 79f8be0c..083ac5fe 100644 --- a/tests/YGComputedPaddingTest.cpp +++ b/tests/YGComputedPaddingTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, computed_layout_padding) { const YGNodeRef root = YGNodeNew(); diff --git a/tests/YGDefaultValuesTest.cpp b/tests/YGDefaultValuesTest.cpp index b553a011..ea64d434 100644 --- a/tests/YGDefaultValuesTest.cpp +++ b/tests/YGDefaultValuesTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, assert_default_values) { const YGNodeRef root = YGNodeNew(); diff --git a/tests/YGDirtyMarkingTest.cpp b/tests/YGDirtyMarkingTest.cpp index 3888966e..c1582e7f 100644 --- a/tests/YGDirtyMarkingTest.cpp +++ b/tests/YGDirtyMarkingTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, dirty_propagation) { const YGNodeRef root = YGNodeNew(); diff --git a/tests/YGEdgeTest.cpp b/tests/YGEdgeTest.cpp index 4122b11b..9775019d 100644 --- a/tests/YGEdgeTest.cpp +++ b/tests/YGEdgeTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, start_overrides) { const YGNodeRef root = YGNodeNew(); diff --git a/tests/YGMeasureCacheTest.cpp b/tests/YGMeasureCacheTest.cpp index 683b3ab8..a53ec1d2 100644 --- a/tests/YGMeasureCacheTest.cpp +++ b/tests/YGMeasureCacheTest.cpp @@ -7,51 +7,54 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include static YGSize _measureMax(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - - int *measureCount = (int *)YGNodeGetContext(node); + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { + int *measureCount = (int *) YGNodeGetContext(node); (*measureCount)++; - return YGSize { + return YGSize{ .width = widthMode == YGMeasureModeUndefined ? 10 : width, .height = heightMode == YGMeasureModeUndefined ? 10 : height, }; } static YGSize _measureMin(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - - int *measureCount = (int *)YGNodeGetContext(node); + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { + int *measureCount = (int *) YGNodeGetContext(node); *measureCount = *measureCount + 1; - return YGSize { - .width = widthMode == YGMeasureModeUndefined || (widthMode == YGMeasureModeAtMost && width > 10) ? 10 : width, - .height = heightMode == YGMeasureModeUndefined || (heightMode == YGMeasureModeAtMost && height > 10) ? 10 : height, + return YGSize{ + .width = + widthMode == YGMeasureModeUndefined || (widthMode == YGMeasureModeAtMost && width > 10) + ? 10 + : width, + .height = + heightMode == YGMeasureModeUndefined || (heightMode == YGMeasureModeAtMost && height > 10) + ? 10 + : height, }; } static YGSize _measure_84_49(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - int *measureCount = (int*) YGNodeGetContext(node); + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { + int *measureCount = (int *) YGNodeGetContext(node); if (measureCount) { (*measureCount)++; } - return YGSize { - .width = 84.f, - .height = 49.f, + return YGSize{ + .width = 84.f, .height = 49.f, }; } @@ -155,19 +158,19 @@ TEST(YogaTest, remeasure_with_already_measured_value_smaller_but_still_float_equ YGNodeStyleSetWidth(root, 288.f); YGNodeStyleSetHeight(root, 288.f); YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow); - + const YGNodeRef root_child0 = YGNodeNew(); YGNodeStyleSetPadding(root_child0, YGEdgeAll, 2.88f); YGNodeStyleSetFlexDirection(root_child0, YGFlexDirectionRow); YGNodeInsertChild(root, root_child0, 0); - + const YGNodeRef root_child0_child0 = YGNodeNew(); YGNodeSetContext(root_child0_child0, &measureCount); YGNodeSetMeasureFunc(root_child0_child0, _measure_84_49); YGNodeInsertChild(root_child0, root_child0_child0, 0); - + YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR); - + YGNodeFreeRecursive(root); ASSERT_EQ(1, measureCount); diff --git a/tests/YGMeasureModeTest.cpp b/tests/YGMeasureModeTest.cpp index cd5aedba..4e259720 100644 --- a/tests/YGMeasureModeTest.cpp +++ b/tests/YGMeasureModeTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include struct _MeasureConstraint { float width; @@ -23,11 +23,12 @@ struct _MeasureConstraintList { }; static YGSize _measure(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - struct _MeasureConstraintList *constraintList = (struct _MeasureConstraintList *)YGNodeGetContext(node); + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { + struct _MeasureConstraintList *constraintList = + (struct _MeasureConstraintList *) YGNodeGetContext(node); struct _MeasureConstraint *constraints = constraintList->constraints; uint32_t currentIndex = constraintList->length; (&constraints[currentIndex])->width = width; @@ -36,16 +37,16 @@ static YGSize _measure(YGNodeRef node, (&constraints[currentIndex])->heightMode = heightMode; constraintList->length = currentIndex + 1; - return YGSize { + return YGSize{ .width = widthMode == YGMeasureModeUndefined ? 10 : width, .height = heightMode == YGMeasureModeUndefined ? 10 : width, }; } TEST(YogaTest, exactly_measure_stretched_child_column) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -69,9 +70,9 @@ TEST(YogaTest, exactly_measure_stretched_child_column) { } TEST(YogaTest, exactly_measure_stretched_child_row) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -96,9 +97,9 @@ TEST(YogaTest, exactly_measure_stretched_child_row) { } TEST(YogaTest, at_most_main_axis_column) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -122,9 +123,9 @@ TEST(YogaTest, at_most_main_axis_column) { } TEST(YogaTest, at_most_cross_axis_column) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -149,9 +150,9 @@ TEST(YogaTest, at_most_cross_axis_column) { } TEST(YogaTest, at_most_main_axis_row) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -176,9 +177,9 @@ TEST(YogaTest, at_most_main_axis_row) { } TEST(YogaTest, at_most_cross_axis_row) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -204,9 +205,9 @@ TEST(YogaTest, at_most_cross_axis_row) { } TEST(YogaTest, flex_child) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -233,9 +234,9 @@ TEST(YogaTest, flex_child) { } TEST(YogaTest, flex_child_with_flex_basis) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -260,9 +261,9 @@ TEST(YogaTest, flex_child_with_flex_basis) { } TEST(YogaTest, overflow_scroll_column) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); @@ -291,9 +292,9 @@ TEST(YogaTest, overflow_scroll_column) { } TEST(YogaTest, overflow_scroll_row) { - struct _MeasureConstraintList constraintList = _MeasureConstraintList { - .length = 0, - .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), + struct _MeasureConstraintList constraintList = _MeasureConstraintList{ + .length = 0, + .constraints = (struct _MeasureConstraint *) malloc(10 * sizeof(struct _MeasureConstraint)), }; const YGNodeRef root = YGNodeNew(); diff --git a/tests/YGMeasureTest.cpp b/tests/YGMeasureTest.cpp index 1e4ad175..c0e3b182 100644 --- a/tests/YGMeasureTest.cpp +++ b/tests/YGMeasureTest.cpp @@ -7,22 +7,21 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include static YGSize _measure(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - int *measureCount = (int*) YGNodeGetContext(node); + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { + int *measureCount = (int *) YGNodeGetContext(node); if (measureCount) { (*measureCount)++; } - return YGSize { - .width = 10, - .height = 10, + return YGSize{ + .width = 10, .height = 10, }; } diff --git a/tests/YGMemoryFuncTest.cpp b/tests/YGMemoryFuncTest.cpp index b6481373..878d4438 100644 --- a/tests/YGMemoryFuncTest.cpp +++ b/tests/YGMemoryFuncTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include extern int32_t gNodeInstanceCount; @@ -66,12 +66,14 @@ TEST(YogaTest, memory_func_test_funcs) { TEST(YogaTest, memory_func_assert_zero_nodes) { gNodeInstanceCount = 0; // Reset YGNode instance count for memory func test const YGNodeRef root = YGNodeNew(); - ASSERT_DEATH(YGSetMemoryFuncs(&testMalloc, &testCalloc, &testRealloc, &testFree), "Cannot set memory functions: all node must be freed first"); + ASSERT_DEATH(YGSetMemoryFuncs(&testMalloc, &testCalloc, &testRealloc, &testFree), + "Cannot set memory functions: all node must be freed first"); YGNodeFreeRecursive(root); } TEST(YogaTest, memory_func_assert_all_non_null) { gNodeInstanceCount = 0; // Reset YGNode instance count for memory func test - ASSERT_DEATH(YGSetMemoryFuncs(NULL, &testCalloc, &testRealloc, &testFree), "Cannot set memory functions: functions must be all NULL or Non-NULL"); + ASSERT_DEATH(YGSetMemoryFuncs(NULL, &testCalloc, &testRealloc, &testFree), + "Cannot set memory functions: functions must be all NULL or Non-NULL"); } #endif diff --git a/tests/YGRelayoutTest.cpp b/tests/YGRelayoutTest.cpp index de298325..4cd22509 100644 --- a/tests/YGRelayoutTest.cpp +++ b/tests/YGRelayoutTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, dont_cache_computed_flex_basis_between_layouts) { YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true); diff --git a/tests/YGRoundingMeasureFuncTest.cpp b/tests/YGRoundingMeasureFuncTest.cpp index 9206c4a8..a55f142c 100644 --- a/tests/YGRoundingMeasureFuncTest.cpp +++ b/tests/YGRoundingMeasureFuncTest.cpp @@ -7,30 +7,26 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include static YGSize _measureFloor(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { return YGSize{ - width = 10.2f, - height = 10.2f, + width = 10.2f, height = 10.2f, }; } static YGSize _measureCeil(YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { - + float width, + YGMeasureMode widthMode, + float height, + YGMeasureMode heightMode) { return YGSize{ - width = 10.5, - height = 10.5, + width = 10.5, height = 10.5, }; } diff --git a/tests/YGStyleTest.cpp b/tests/YGStyleTest.cpp index 83555edd..979d5f5f 100644 --- a/tests/YGStyleTest.cpp +++ b/tests/YGStyleTest.cpp @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#include #include +#include TEST(YogaTest, copy_style_same) { const YGNodeRef node0 = YGNodeNew();