feat(CSSLayout) - fix enums to compile

mattpodwysocki · mattpodwysocki · commit 9ecaeee3c2a9 · 2016-09-02T12:19:06.000-04:00
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSAlign.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSAlign.h
@@ -4,10 +4,10 @@ namespace CssLayoutEngine
 {
     public enum class CSSAlign
     {
-        AUTO,
-        FLEX_START,
-        CENTER,
-        FLEX_END,
-        STRETCH
+        Auto,
+        FlexStart,
+        Center,
+        FlexEnd,
+        Stretch
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSDirection.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSDirection.h
@@ -4,7 +4,7 @@ namespace CssLayoutEngine
 {
     public enum class CSSDirection
     {
-        INHERIT,
+        Inherit,
         LTR,
         RTL,
     };
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSFlexDirection.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSFlexDirection.h
@@ -4,9 +4,9 @@ namespace CssLayoutEngine
 {
     public enum class CSSFlexDirection
     {
-        COLUMN,
-        COLUMN_REVERSE,
-        ROW,
-        ROW_REVERSE
+        Column,
+        ColumnReverse,
+        Row,
+        RowReverse
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSJustify.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSJustify.h
@@ -4,10 +4,10 @@ namespace CssLayoutEngine
 {
     public enum class CSSJustify
     {
-        FLEX_START,
-        CENTER,
-        FLEX_END,
-        SPACE_BETWEEN,
-        SPACE_AROUND,
+        FlexStart,
+        Center,
+        FlexEnd,
+        SpaceBetween,
+        SpaceAround,
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSMeasureMode.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSMeasureMode.h
@@ -4,8 +4,8 @@ namespace CssLayoutEngine
 {
     public enum class CSSMeasureMode
     {
-        UNDEFINED,
-        EXACTLY,
-        AT_MOST,
+        Undefined,
+        Exactly,
+        AtMost,
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSOverflow.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSOverflow.h
@@ -4,7 +4,7 @@ namespace CssLayoutEngine
 {
     public enum class CSSOverflow
     {
-        VISIBLE,
-        HIDDEN,
+        Visible,
+        Hidden,
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSPositionType.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSPositionType.h
@@ -4,7 +4,7 @@ namespace CssLayoutEngine
 {
     public enum class CSSPositionType
     {
-        RELATIVE,
-        ABSOLUTE,
+        Relative,
+        Absolute,
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CSSWrap.h b/ReactWindows/CSSLayout/CssLayoutEngine/CSSWrap.h
@@ -4,7 +4,7 @@ namespace CssLayoutEngine
 {
     public enum class CSSWrap
     {
-        NOWRAP,
-        WRAP,
+        NoWrap,
+        Wrap,
     };
 }
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CssLayoutEngine.vcxproj b/ReactWindows/CSSLayout/CssLayoutEngine/CssLayoutEngine.vcxproj
@@ -212,15 +212,19 @@
     <ClInclude Include="CSSDirection.h" />
     <ClInclude Include="CSSFlexDirection.h" />
     <ClInclude Include="CSSJustify.h" />
+    <ClInclude Include="CSSLayoutContext.h" />
     <ClInclude Include="CSSMeasureMode.h" />
     <ClInclude Include="CSSOverflow.h" />
     <ClInclude Include="CSSPositionType.h" />
     <ClInclude Include="CSSWrap.h" />
+    <ClInclude Include="LayoutEngine.h" />
+    <ClInclude Include="MeasureOutput.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="SpacingType.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CSSConstants.cpp" />
+    <ClCompile Include="LayoutEngine.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/CssLayoutEngine.vcxproj.filters b/ReactWindows/CSSLayout/CssLayoutEngine/CssLayoutEngine.vcxproj.filters
@@ -9,6 +9,7 @@
   <ItemGroup>
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="CSSConstants.cpp" />
+    <ClCompile Include="LayoutEngine.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />
@@ -23,5 +24,8 @@
     <ClInclude Include="CSSFlexDirection.h" />
     <ClInclude Include="CSSMeasureMode.h" />
     <ClInclude Include="CSSCachedMeasurement.h" />
+    <ClInclude Include="CSSLayoutContext.h" />
+    <ClInclude Include="MeasureOutput.h" />
+    <ClInclude Include="LayoutEngine.h" />
   </ItemGroup>
 </Project>
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/LayoutEngine.cpp b/ReactWindows/CSSLayout/CssLayoutEngine/LayoutEngine.cpp
@@ -0,0 +1,15 @@
+#include "pch.h"
+#include "LayoutEngine.h"
+
+#include "CSSFlexDirection.h"
+#include "CSSPositionType.h"
+
+using namespace CssLayoutEngine;
+
+int CSS_FLEX_DIRECTION_COLUMN = (int)CSSFlexDirection::Column;
+int CSS_FLEX_DIRECTION_COLUMN_REVERSE = (int)CSSFlexDirection::ColumnReverse;
+int CSS_FLEX_DIRECTION_ROW = (int)CSSFlexDirection::Row;
+int CSS_FLEX_DIRECTION_ROW_REVERSE = (int)CSSFlexDirection::RowReverse;
+
+int CSS_POSITION_RELATIVE = (int)CSSPositionType::Relative;
+int CSS_POSITION_ABSOLUTE = (int)CSSPositionType::Absolute;
diff --git a/ReactWindows/CSSLayout/CssLayoutEngine/LayoutEngine.h b/ReactWindows/CSSLayout/CssLayoutEngine/LayoutEngine.h
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace CssLayoutEngine
+{
+    public ref class LayoutEngine sealed
+    {
+
+    };
+}
diff --git a/ReactWindows/ReactNative/CssLayout/Native.cs b/ReactWindows/ReactNative/CssLayout/Native.cs
diff --git a/ReactWindows/ReactNative/ReactNative.csproj b/ReactWindows/ReactNative/ReactNative.csproj
@@ -171,7 +171,6 @@
     <Compile Include="Collections\HeapBasedPriorityQueue.cs" />
     <Compile Include="Collections\ListExtensions.cs" />
     <Compile Include="Common\WindowsPlatformHelper.cs" />
-    <Compile Include="CssLayout\Native.cs" />
     <Compile Include="DevSupport\DebugServerException.cs" />
     <Compile Include="DevSupport\DevInternalSettings.cs" />
     <Compile Include="DevSupport\DevOptionDialog.xaml.cs">

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSAlign`
`6`	`6`	`{`
`7`		`- AUTO,`
`8`		`- FLEX_START,`
`9`		`- CENTER,`
`10`		`- FLEX_END,`
`11`		`- STRETCH`
	`7`	`+ Auto,`
	`8`	`+ FlexStart,`
	`9`	`+ Center,`
	`10`	`+ FlexEnd,`
	`11`	`+ Stretch`
`12`	`12`	`};`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSDirection`
`6`	`6`	`{`
`7`		`- INHERIT,`
	`7`	`+ Inherit,`
`8`	`8`	`LTR,`
`9`	`9`	`RTL,`
`10`	`10`	`};`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSFlexDirection`
`6`	`6`	`{`
`7`		`- COLUMN,`
`8`		`- COLUMN_REVERSE,`
`9`		`- ROW,`
`10`		`- ROW_REVERSE`
	`7`	`+ Column,`
	`8`	`+ ColumnReverse,`
	`9`	`+ Row,`
	`10`	`+ RowReverse`
`11`	`11`	`};`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSJustify`
`6`	`6`	`{`
`7`		`- FLEX_START,`
`8`		`- CENTER,`
`9`		`- FLEX_END,`
`10`		`- SPACE_BETWEEN,`
`11`		`- SPACE_AROUND,`
	`7`	`+ FlexStart,`
	`8`	`+ Center,`
	`9`	`+ FlexEnd,`
	`10`	`+ SpaceBetween,`
	`11`	`+ SpaceAround,`
`12`	`12`	`};`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSMeasureMode`
`6`	`6`	`{`
`7`		`- UNDEFINED,`
`8`		`- EXACTLY,`
`9`		`- AT_MOST,`
	`7`	`+ Undefined,`
	`8`	`+ Exactly,`
	`9`	`+ AtMost,`
`10`	`10`	`};`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSOverflow`
`6`	`6`	`{`
`7`		`- VISIBLE,`
`8`		`- HIDDEN,`
	`7`	`+ Visible,`
	`8`	`+ Hidden,`
`9`	`9`	`};`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSPositionType`
`6`	`6`	`{`
`7`		`- RELATIVE,`
`8`		`- ABSOLUTE,`
	`7`	`+ Relative,`
	`8`	`+ Absolute,`
`9`	`9`	`};`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace CssLayoutEngine`
`4`	`4`	`{`
`5`	`5`	`public enum class CSSWrap`
`6`	`6`	`{`
`7`		`- NOWRAP,`
`8`		`- WRAP,`
	`7`	`+ NoWrap,`
	`8`	`+ Wrap,`
`9`	`9`	`};`
`10`	`10`	`}`