diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java index e0744e3b..c01d0cec 100644 --- a/java/com/facebook/yoga/YogaNode.java +++ b/java/com/facebook/yoga/YogaNode.java @@ -89,6 +89,8 @@ public abstract class YogaNode { public abstract void setPositionType(YogaPositionType positionType); + public abstract YogaWrap getWrap(); + public abstract void setWrap(YogaWrap flexWrap); public abstract YogaOverflow getOverflow(); @@ -99,6 +101,8 @@ public abstract class YogaNode { public abstract void setDisplay(YogaDisplay display); + public abstract float getFlex(); + public abstract void setFlex(float flex); public abstract float getFlexGrow(); diff --git a/java/com/facebook/yoga/YogaNodeJNI.java b/java/com/facebook/yoga/YogaNodeJNI.java index c0dbccd3..790b23bf 100644 --- a/java/com/facebook/yoga/YogaNodeJNI.java +++ b/java/com/facebook/yoga/YogaNodeJNI.java @@ -351,6 +351,11 @@ public class YogaNodeJNI extends YogaNode { jni_YGNodeStyleSetPositionType(mNativePointer, positionType.intValue()); } + private static native int jni_YGNodeStyleGetFlexWrap(long nativePointer); + public YogaWrap getWrap() { + return YogaWrap.fromInt(jni_YGNodeStyleGetFlexWrap(mNativePointer)); + } + private static native void jni_YGNodeStyleSetFlexWrap(long nativePointer, int wrapType); public void setWrap(YogaWrap flexWrap) { jni_YGNodeStyleSetFlexWrap(mNativePointer, flexWrap.intValue()); @@ -376,6 +381,11 @@ public class YogaNodeJNI extends YogaNode { jni_YGNodeStyleSetDisplay(mNativePointer, display.intValue()); } + private static native float jni_YGNodeStyleGetFlex(long nativePointer); + public float getFlex() { + return jni_YGNodeStyleGetFlex(mNativePointer); + } + private static native void jni_YGNodeStyleSetFlex(long nativePointer, float flex); public void setFlex(float flex) { jni_YGNodeStyleSetFlex(mNativePointer, flex); diff --git a/java/jni/YGJNI.cpp b/java/jni/YGJNI.cpp index b8da886c..1b9726d5 100644 --- a/java/jni/YGJNI.cpp +++ b/java/jni/YGJNI.cpp @@ -584,6 +584,9 @@ YG_NODE_JNI_STYLE_PROP(jint, YGWrap, FlexWrap); YG_NODE_JNI_STYLE_PROP(jint, YGOverflow, Overflow); YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display); +jfloat jni_YGNodeStyleGetFlex(jlong nativePointer) { + return YGNodeStyleGetFlex(_jlong2YGNodeRef(nativePointer)); +} void jni_YGNodeStyleSetFlex(jlong nativePointer, jfloat value) { YGNodeStyleSetFlex( _jlong2YGNodeRef(nativePointer), static_cast(value)); @@ -988,11 +991,13 @@ jint JNI_OnLoad(JavaVM* vm, void*) { YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignContent), YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPositionType), YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPositionType), + YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexWrap), YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexWrap), YGMakeCriticalNativeMethod(jni_YGNodeStyleGetOverflow), YGMakeCriticalNativeMethod(jni_YGNodeStyleSetOverflow), YGMakeCriticalNativeMethod(jni_YGNodeStyleGetDisplay), YGMakeCriticalNativeMethod(jni_YGNodeStyleSetDisplay), + YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlex), YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlex), YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexGrow), YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexGrow),