DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Merge remote-tracking branch 'refs/remotes/facebook/master' into percentage-feature

Browse Source 
# Conflicts:
#	csharp/Facebook.Yoga/YogaNode.Create.cs
This commit is contained in:
Lukas Woehrl
2016-12-19 23:04:15 +01:00
parent e2c586490a 74fb205083
commit 1cb7ca431d
16 changed files with 330 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
csharp/Facebook.Yoga/Native.cs
View File

@@ -14,7 +14,7 @@ namespace Facebook.Yoga
{
internal static class Native
{
#if UNITY_IOS && !UNITY_EDITOR
#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
private const string DllName = "__Internal";
#else
private const string DllName = "yoga";
@@ -27,9 +27,6 @@ namespace Facebook.Yoga
[DllImport(DllName)]
public static extern IntPtr YGNodeNew();
[DllImport(DllName)]
public static extern void YGNodeInit(IntPtr node);
[DllImport(DllName)]
public static extern void YGNodeFree(IntPtr node);
@@ -58,7 +55,7 @@ namespace Facebook.Yoga
public static extern IntPtr YGNodeGetChild(IntPtr node, uint index);
[DllImport(DllName)]
public static extern uint YGNodeChildCount(IntPtr node);
public static extern uint YGNodeGetChildCount(IntPtr node);
[DllImport(DllName)]
public static extern void YGNodeCalculateLayout(IntPtr node,