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

Use single function for margin, position, padding, and border

Browse Source 
Summary:
marginLeft(node, margin) -> margin(node, CSSEdgeLeft, margin)

This reduces the api surface of CSSLayout as well as puts the api more in line with the java version. This also adds support for CSSEdgeAll which java has had support for for a while. This also open up the possibility of doing margin(node, CSSEdgeLeft | CSSEdgeTop, margin) in the future.

Reviewed By: lucasr

Differential Revision: D3715201

fbshipit-source-id: ea81ed426f0f7853bb542355c01fc16ae4360238
This commit is contained in:
Emil Sjolander
2016-08-15 09:15:10 -07:00
committed by Facebook Github Bot 6
parent 48e5304276
commit a960203567
6 changed files with 125 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
java/jni/CSSJNI.c
View File

@@ -27,6 +27,19 @@
CSSNodeStyleSet##name((CSSNodeRef) nativePointer, (type) value); \
})
#define CSS_NODE_JNI_STYLE_EDGE_PROP(javatype, type, name) \
CSS_NODE_JNI( \
javatype, \
CSSNodeStyleGet##name(JNIEnv *env, jobject instance, jint nativePointer, jint edge) { \
return (javatype) CSSNodeStyleGet##name((CSSNodeRef) nativePointer, (CSSEdge) edge); \
}) \
\
CSS_NODE_JNI(void, \
CSSNodeStyleSet##name( \
JNIEnv *env, jobject instance, jint nativePointer, jint edge, javatype value) { \
CSSNodeStyleSet##name((CSSNodeRef) nativePointer, (CSSEdge) edge, (type) value); \
})
#define CSS_NODE_JNI_LAYOUT_PROP(javatype, type, name) \
CSS_NODE_JNI(javatype, \
CSSNodeLayoutGet##name(JNIEnv *env, jobject instance, jint nativePointer) { \
@@ -174,33 +187,10 @@ CSS_NODE_JNI_STYLE_PROP(jfloat, float, FlexGrow);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, FlexShrink);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, FlexBasis);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MarginLeft);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MarginTop);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MarginRight);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MarginBottom);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MarginStart);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MarginEnd);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PaddingLeft);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PaddingTop);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PaddingRight);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PaddingBottom);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PaddingStart);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PaddingEnd);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, BorderLeft);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, BorderTop);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, BorderRight);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, BorderBottom);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, BorderStart);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, BorderEnd);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PositionLeft);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PositionTop);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PositionRight);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PositionBottom);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PositionStart);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, PositionEnd);
CSS_NODE_JNI_STYLE_EDGE_PROP(jfloat, float, Position);
CSS_NODE_JNI_STYLE_EDGE_PROP(jfloat, float, Margin);
CSS_NODE_JNI_STYLE_EDGE_PROP(jfloat, float, Padding);
CSS_NODE_JNI_STYLE_EDGE_PROP(jfloat, float, Border);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, Width);
CSS_NODE_JNI_STYLE_PROP(jfloat, float, MinWidth);