From 2e908bfdeeada586e14294fbbbc45de7d7fd8c7e Mon Sep 17 00:00:00 2001 From: Armin Sander Date: Fri, 25 Sep 2015 10:48:46 +0200 Subject: [PATCH] don't use C#6 language features for the time being --- .../LayoutEngineTest.cs | 8 +- src/csharp/Facebook.CSSLayout/CSSNode.cs | 73 ++++++++++++++----- .../Facebook.CSSLayout/CSSPositionType.cs | 10 +-- .../Facebook.CSSLayout/CachedCSSLayout.cs | 16 ++-- .../Facebook.CSSLayout.csproj | 1 + src/csharp/Facebook.CSSLayout/LayoutEngine.cs | 8 +- .../Facebook.CSSLayout/MeasureOutput.cs | 11 ++- 7 files changed, 92 insertions(+), 35 deletions(-) diff --git a/src/csharp/Facebook.CSSLayout.Tests/LayoutEngineTest.cs b/src/csharp/Facebook.CSSLayout.Tests/LayoutEngineTest.cs index 2331433c..3fadb61b 100644 --- a/src/csharp/Facebook.CSSLayout.Tests/LayoutEngineTest.cs +++ b/src/csharp/Facebook.CSSLayout.Tests/LayoutEngineTest.cs @@ -9,7 +9,6 @@ using System; using NUnit.Framework; -using static Facebook.CSSLayout.CSSLayout; namespace Facebook.CSSLayout.Tests { @@ -19,6 +18,13 @@ namespace Facebook.CSSLayout.Tests */ public class LayoutEngineTest { + const int POSITION_LEFT = CSSLayout.POSITION_LEFT; + const int POSITION_TOP = CSSLayout.POSITION_TOP; + const int POSITION_RIGHT = CSSLayout.POSITION_RIGHT; + const int POSITION_BOTTOM = CSSLayout.POSITION_BOTTOM; + const int DIMENSION_HEIGHT = CSSLayout.DIMENSION_HEIGHT; + const int DIMENSION_WIDTH = CSSLayout.DIMENSION_WIDTH; + static readonly MeasureFunction sTestMeasureFunction = (node, width) => { if (CSSConstants.IsUndefined(width)) { diff --git a/src/csharp/Facebook.CSSLayout/CSSNode.cs b/src/csharp/Facebook.CSSLayout/CSSNode.cs index 096a9d7c..9479f7bb 100644 --- a/src/csharp/Facebook.CSSLayout/CSSNode.cs +++ b/src/csharp/Facebook.CSSLayout/CSSNode.cs @@ -10,7 +10,6 @@ using System; using System.Collections.Generic; using System.Text; -using static Facebook.CSSLayout.CSSLayout; namespace Facebook.CSSLayout { @@ -27,6 +26,13 @@ namespace Facebook.CSSLayout public class CSSNode { + const int POSITION_LEFT = CSSLayout.POSITION_LEFT; + const int POSITION_TOP = CSSLayout.POSITION_TOP; + const int POSITION_RIGHT = CSSLayout.POSITION_RIGHT; + const int POSITION_BOTTOM = CSSLayout.POSITION_BOTTOM; + const int DIMENSION_WIDTH = CSSLayout.DIMENSION_WIDTH; + const int DIMENSION_HEIGHT = CSSLayout.DIMENSION_HEIGHT; + enum LayoutState { /** @@ -61,14 +67,20 @@ namespace Facebook.CSSLayout [Nullable] MeasureFunction mMeasureFunction = null; LayoutState mLayoutState = LayoutState.DIRTY; - public int ChildCount - => mChildren.Count; + public int ChildCount + { + get { return mChildren.Count; } + } - public CSSNode this[int i] - => mChildren[i]; + public CSSNode this[int i] + { + get { return mChildren[i]; } + } - public IEnumerable Children - => mChildren; + public IEnumerable Children + { + get { return mChildren; } + } public void AddChild(CSSNode child) { @@ -123,8 +135,10 @@ namespace Facebook.CSSLayout } } - public bool IsMeasureDefined - => mMeasureFunction != null; + public bool IsMeasureDefined + { + get { return mMeasureFunction != null; } + } internal MeasureOutput measure(MeasureOutput measureOutput, float width) { @@ -151,15 +165,19 @@ namespace Facebook.CSSLayout * See {@link LayoutState#DIRTY}. */ - public bool IsDirty - => mLayoutState == LayoutState.DIRTY; + public bool IsDirty + { + get { return mLayoutState == LayoutState.DIRTY; } + } /** * See {@link LayoutState#HAS_NEW_LAYOUT}. */ - public bool HasNewLayout - => mLayoutState == LayoutState.HAS_NEW_LAYOUT; + public bool HasNewLayout + { + get { return mLayoutState == LayoutState.HAS_NEW_LAYOUT; } + } internal protected void dirty() { @@ -395,11 +413,30 @@ namespace Facebook.CSSLayout set { updateFloatValue(ref style.maxHeight, value); } } - public float LayoutX => layout.position[POSITION_LEFT]; - public float LayoutY => layout.position[POSITION_TOP]; - public float LayoutWidth => layout.dimensions[DIMENSION_WIDTH]; - public float LayoutHeight => layout.dimensions[DIMENSION_HEIGHT]; - public CSSDirection LayoutDirection => layout.direction; + public float LayoutX + { + get { return layout.position[POSITION_LEFT]; } + } + + public float LayoutY + { + get { return layout.position[POSITION_TOP]; } + } + + public float LayoutWidth + { + get { return layout.dimensions[DIMENSION_WIDTH]; } + } + + public float LayoutHeight + { + get { return layout.dimensions[DIMENSION_HEIGHT]; } + } + + public CSSDirection LayoutDirection + { + get { return layout.direction; } + } /** * Set a default padding (left/top/right/bottom) for this node. diff --git a/src/csharp/Facebook.CSSLayout/CSSPositionType.cs b/src/csharp/Facebook.CSSLayout/CSSPositionType.cs index e5636eac..0c11bc61 100644 --- a/src/csharp/Facebook.CSSLayout/CSSPositionType.cs +++ b/src/csharp/Facebook.CSSLayout/CSSPositionType.cs @@ -8,10 +8,10 @@ */ namespace Facebook.CSSLayout -{ - public enum CSSPositionType - { - Relative, - Absolute +{ + public enum CSSPositionType + { + Relative, + Absolute } } diff --git a/src/csharp/Facebook.CSSLayout/CachedCSSLayout.cs b/src/csharp/Facebook.CSSLayout/CachedCSSLayout.cs index 67ee29ff..4831c53e 100644 --- a/src/csharp/Facebook.CSSLayout/CachedCSSLayout.cs +++ b/src/csharp/Facebook.CSSLayout/CachedCSSLayout.cs @@ -8,17 +8,17 @@ */ namespace Facebook.CSSLayout -{ +{ /** * CSSLayout with additional information about the conditions under which it was generated. * {@link #RequestedWidth} and {@link #RequestedHeight} are the width and height the parent set on * this node before calling layout visited us. - */ - - class CachedCSSLayout : CSSLayout - { - public float requestedWidth = CSSConstants.Undefined; - public float requestedHeight = CSSConstants.Undefined; - public float parentMaxWidth = CSSConstants.Undefined; + */ + + class CachedCSSLayout : CSSLayout + { + public float requestedWidth = CSSConstants.Undefined; + public float requestedHeight = CSSConstants.Undefined; + public float parentMaxWidth = CSSConstants.Undefined; } } diff --git a/src/csharp/Facebook.CSSLayout/Facebook.CSSLayout.csproj b/src/csharp/Facebook.CSSLayout/Facebook.CSSLayout.csproj index a5a329ad..ace4f00b 100755 --- a/src/csharp/Facebook.CSSLayout/Facebook.CSSLayout.csproj +++ b/src/csharp/Facebook.CSSLayout/Facebook.CSSLayout.csproj @@ -24,6 +24,7 @@ DEBUG;TRACE prompt 4 + 5 none diff --git a/src/csharp/Facebook.CSSLayout/LayoutEngine.cs b/src/csharp/Facebook.CSSLayout/LayoutEngine.cs index 819ea4c3..7f3f09b5 100644 --- a/src/csharp/Facebook.CSSLayout/LayoutEngine.cs +++ b/src/csharp/Facebook.CSSLayout/LayoutEngine.cs @@ -9,7 +9,6 @@ using System; using boolean = System.Boolean; -using static Facebook.CSSLayout.CSSLayout; namespace Facebook.CSSLayout { @@ -20,6 +19,13 @@ namespace Facebook.CSSLayout static class LayoutEngine { + const int POSITION_LEFT = CSSLayout.POSITION_LEFT; + const int POSITION_TOP = CSSLayout.POSITION_TOP; + const int POSITION_RIGHT = CSSLayout.POSITION_RIGHT; + const int POSITION_BOTTOM = CSSLayout.POSITION_BOTTOM; + const int DIMENSION_WIDTH = CSSLayout.DIMENSION_WIDTH; + const int DIMENSION_HEIGHT = CSSLayout.DIMENSION_HEIGHT; + const int CSS_FLEX_DIRECTION_COLUMN = (int)CSSFlexDirection.Column; const int CSS_FLEX_DIRECTION_COLUMN_REVERSE = diff --git a/src/csharp/Facebook.CSSLayout/MeasureOutput.cs b/src/csharp/Facebook.CSSLayout/MeasureOutput.cs index d08fcfe6..1d2bb1ce 100644 --- a/src/csharp/Facebook.CSSLayout/MeasureOutput.cs +++ b/src/csharp/Facebook.CSSLayout/MeasureOutput.cs @@ -23,7 +23,14 @@ namespace Facebook.CSSLayout public readonly float Width; public readonly float Height; - internal float width => Width; - internal float height => Height; + internal float width + { + get { return Width; } + } + + internal float height + { + get { return Height; } + } } } \ No newline at end of file