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

Use spacing for position

Browse Source 
Summary: Use spacing for position in public api. This was already the case internally

Differential Revision: D3690235

fbshipit-source-id: 4c04952e6ded32fd5fbfdccf63736cf025ae470e
This commit is contained in:
Emil Sjolander
2016-08-10 05:08:13 -07:00
committed by Facebook Github Bot 7
parent 7f27046cc5
commit f15b563166
4 changed files with 111 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
java/com/facebook/csslayout/CSSNode.java
View File

@@ -19,12 +19,6 @@ import static com.facebook.csslayout.CSSLayout.DIMENSION_HEIGHT;
import static com.facebook.csslayout.CSSLayout.DIMENSION_WIDTH;
import static com.facebook.csslayout.CSSLayout.POSITION_LEFT;
import static com.facebook.csslayout.CSSLayout.POSITION_TOP;
import static com.facebook.csslayout.Spacing.BOTTOM;
import static com.facebook.csslayout.Spacing.END;
import static com.facebook.csslayout.Spacing.LEFT;
import static com.facebook.csslayout.Spacing.RIGHT;
import static com.facebook.csslayout.Spacing.START;
import static com.facebook.csslayout.Spacing.TOP;
/**
* A CSS Node. It has a style object you can manipulate at {@link #style}. After calling
@@ -414,95 +408,17 @@ public class CSSNode implements CSSNodeAPI<CSSNode> {
* Get this node's position, as defined by style.
*/
@Override
public Spacing getPositionValue() {
public Spacing getPosition() {
return style.position;
}
@Override
public void setPositionValue(int spacingType, float position) {
public void setPosition(int spacingType, float position) {
if (style.position.set(spacingType, position)) {
dirty();
}
}
/**
* Get this node's position top, as defined by style.
*/
@Override
public float getPositionTop() {
return style.position.get(TOP);
}
@Override
public void setPositionTop(float positionTop) {
setPositionValue(TOP, positionTop);
}
/**
* Get this node's position bottom, as defined by style.
*/
@Override
public float getPositionBottom() {
return style.position.get(BOTTOM);
}
@Override
public void setPositionBottom(float positionBottom) {
setPositionValue(BOTTOM, positionBottom);
}
/**
* Get this node's position left, as defined by style.
*/
@Override
public float getPositionLeft() {
return style.position.get(LEFT);
}
@Override
public void setPositionLeft(float positionLeft) {
setPositionValue(LEFT, positionLeft);
}
/**
* Get this node's position right, as defined by style.
*/
@Override
public float getPositionRight() {
return style.position.get(RIGHT);
}
@Override
public void setPositionRight(float positionRight) {
setPositionValue(RIGHT, positionRight);
}
/**
* Get this node's position start, as defined by style.
*/
@Override
public float getPositionStart() {
return style.position.get(START);
}
@Override
public void setPositionStart(float positionStart) {
setPositionValue(START, positionStart);
}
/**
* Get this node's position end, as defined by style.
*/
@Override
public float getPositionEnd() {
return style.position.get(END);
}
@Override
public void setPositionEnd(float positionEnd) {
setPositionValue(END, positionEnd);
}
/**
* Get this node's width, as defined in the style.
*/

16
java/com/facebook/csslayout/CSSNodeAPI.java
View File

@@ -58,20 +58,8 @@ public interface CSSNodeAPI<CSSNodeType extends CSSNodeAPI> {
void setPadding(int spacingType, float padding);
Spacing getBorder();
void setBorder(int spacingType, float border);
Spacing getPositionValue();
void setPositionValue(int spacingType, float position);
float getPositionTop();
void setPositionTop(float positionTop);
float getPositionBottom();
void setPositionBottom(float positionBottom);
float getPositionLeft();
void setPositionLeft(float positionLeft);
float getPositionRight();
void setPositionRight(float positionRight);
float getPositionStart();
void setPositionStart(float positionStart);
float getPositionEnd();
void setPositionEnd(float positionEnd);
Spacing getPosition();
void setPosition(int spacingType, float position);
float getStyleWidth();
void setStyleWidth(float width);
float getStyleHeight();

142
java/com/facebook/csslayout/CSSNodeJNI.java
View File

@@ -488,118 +488,72 @@ public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
}
}
private native float jni_CSSNodeStyleGetPositionLeft(int nativePointer);
private native float jni_CSSNodeStyleGetPositionTop(int nativePointer);
private native float jni_CSSNodeStyleGetPositionRight(int nativePointer);
private native float jni_CSSNodeStyleGetPositionBottom(int nativePointer);
private native float jni_CSSNodeStyleGetPositionStart(int nativePointer);
private native float jni_CSSNodeStyleGetPositionEnd(int nativePointer);
@Override
public Spacing getPositionValue() {
public Spacing getPosition() {
Spacing position = new Spacing();
position.set(Spacing.LEFT, getPositionLeft());
position.set(Spacing.TOP, getPositionTop());
position.set(Spacing.RIGHT, getPositionRight());
position.set(Spacing.BOTTOM, getPositionBottom());
position.set(Spacing.LEFT, jni_CSSNodeStyleGetPositionLeft(mNativePointer));
position.set(Spacing.TOP, jni_CSSNodeStyleGetPositionTop(mNativePointer));
position.set(Spacing.RIGHT, jni_CSSNodeStyleGetPositionRight(mNativePointer));
position.set(Spacing.BOTTOM, jni_CSSNodeStyleGetPositionBottom(mNativePointer));
position.set(Spacing.START, jni_CSSNodeStyleGetPositionStart(mNativePointer));
position.set(Spacing.END, jni_CSSNodeStyleGetPositionEnd(mNativePointer));
return position;
}
private native void jni_CSSNodeStyleSetPositionLeft(int nativePointer, float position);
private native void jni_CSSNodeStyleSetPositionTop(int nativePointer, float position);
private native void jni_CSSNodeStyleSetPositionRight(int nativePointer, float position);
private native void jni_CSSNodeStyleSetPositionBottom(int nativePointer, float position);
private native void jni_CSSNodeStyleSetPositionStart(int nativePointer, float position);
private native void jni_CSSNodeStyleSetPositionEnd(int nativePointer, float position);
@Override
public void setPositionValue(int spacingType, float position) {
public void setPosition(int spacingType, float position) {
switch (spacingType) {
case Spacing.LEFT:
setPositionLeft(position);
jni_CSSNodeStyleSetPositionLeft(mNativePointer, position);
break;
case Spacing.TOP:
setPositionTop(position);
jni_CSSNodeStyleSetPositionTop(mNativePointer, position);
break;
case Spacing.RIGHT:
setPositionRight(position);
jni_CSSNodeStyleSetPositionRight(mNativePointer, position);
break;
case Spacing.BOTTOM:
setPositionBottom(position);
jni_CSSNodeStyleSetPositionBottom(mNativePointer, position);
break;
case Spacing.START:
jni_CSSNodeStyleSetPositionStart(mNativePointer, position);
break;
case Spacing.END:
jni_CSSNodeStyleSetPositionEnd(mNativePointer, position);
break;
case Spacing.HORIZONTAL:
jni_CSSNodeStyleSetPositionLeft(mNativePointer, position);
jni_CSSNodeStyleSetPositionRight(mNativePointer, position);
jni_CSSNodeStyleSetPositionStart(mNativePointer, position);
jni_CSSNodeStyleSetPositionEnd(mNativePointer, position);
break;
case Spacing.VERTICAL:
jni_CSSNodeStyleSetPositionTop(mNativePointer, position);
jni_CSSNodeStyleSetPositionBottom(mNativePointer, position);
break;
case Spacing.ALL:
jni_CSSNodeStyleSetPositionLeft(mNativePointer, position);
jni_CSSNodeStyleSetPositionRight(mNativePointer, position);
jni_CSSNodeStyleSetPositionStart(mNativePointer, position);
jni_CSSNodeStyleSetPositionEnd(mNativePointer, position);
jni_CSSNodeStyleSetPositionTop(mNativePointer, position);
jni_CSSNodeStyleSetPositionBottom(mNativePointer, position);
break;
}
}
private native float jni_CSSNodeStyleGetPositionTop(int nativePointer);
@Override
public float getPositionTop() {
assertNativeInstance();
return jni_CSSNodeStyleGetPositionTop(mNativePointer);
}
private native void jni_CSSNodeStyleSetPositionTop(int nativePointer, float positionTop);
@Override
public void setPositionTop(float positionTop) {
assertNativeInstance();
jni_CSSNodeStyleSetPositionTop(mNativePointer, positionTop);
}
private native float jni_CSSNodeStyleGetPositionBottom(int nativePointer);
@Override
public float getPositionBottom() {
assertNativeInstance();
return jni_CSSNodeStyleGetPositionBottom(mNativePointer);
}
private native void jni_CSSNodeStyleSetPositionBottom(int nativePointer, float positionBottom);
@Override
public void setPositionBottom(float positionBottom) {
assertNativeInstance();
jni_CSSNodeStyleSetPositionBottom(mNativePointer, positionBottom);
}
private native float jni_CSSNodeStyleGetPositionLeft(int nativePointer);
@Override
public float getPositionLeft() {
assertNativeInstance();
return jni_CSSNodeStyleGetPositionLeft(mNativePointer);
}
private native void jni_CSSNodeStyleSetPositionLeft(int nativePointer, float positionLeft);
@Override
public void setPositionLeft(float positionLeft) {
assertNativeInstance();
jni_CSSNodeStyleSetPositionLeft(mNativePointer, positionLeft);
}
private native float jni_CSSNodeStyleGetPositionRight(int nativePointer);
@Override
public float getPositionRight() {
assertNativeInstance();
return jni_CSSNodeStyleGetPositionRight(mNativePointer);
}
private native void jni_CSSNodeStyleSetPositionRight(int nativePointer, float positionRight);
@Override
public void setPositionRight(float positionRight) {
assertNativeInstance();
jni_CSSNodeStyleSetPositionRight(mNativePointer, positionRight);
}
private native float jni_CSSNodeStyleGetPositionStart(int nativePointer);
@Override
public float getPositionStart() {
assertNativeInstance();
return jni_CSSNodeStyleGetPositionStart(mNativePointer);
}
private native void jni_CSSNodeStyleSetPositionStart(int nativePointer, float positionStart);
@Override
public void setPositionStart(float positionStart) {
assertNativeInstance();
jni_CSSNodeStyleSetPositionStart(mNativePointer, positionStart);
}
private native float jni_CSSNodeStyleGetPositionEnd(int nativePointer);
@Override
public float getPositionEnd() {
assertNativeInstance();
return jni_CSSNodeStyleGetPositionEnd(mNativePointer);
}
private native void jni_CSSNodeStyleSetPositionEnd(int nativePointer, float positionEnd);
@Override
public void setPositionEnd(float positionEnd) {
assertNativeInstance();
jni_CSSNodeStyleSetPositionEnd(mNativePointer, positionEnd);
}
private native float jni_CSSNodeStyleGetWidth(int nativePointer);
@Override
public float getStyleWidth() {