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

[java] use getRaw to test if START/END were set

Browse Source
This commit is contained in:
Felix Oghină
2015-05-15 16:52:57 +01:00
parent 0e47d8a972
commit da98e234d7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/src/com/facebook/csslayout/LayoutEngine.java
View File

@@ -204,7 +204,7 @@ public class LayoutEngine {
private static float getLeadingMargin(CSSNode node, CSSFlexDirection axis) { private static float getLeadingMargin(CSSNode node, CSSFlexDirection axis) {
if (isRowDirection(axis)) { if (isRowDirection(axis)) {
float leadingMargin = getMargin(node, PositionIndex.START); float leadingMargin = node.style.margin.getRaw(Spacing.START);
if (!CSSConstants.isUndefined(leadingMargin)) { if (!CSSConstants.isUndefined(leadingMargin)) {
return leadingMargin; return leadingMargin;
} }
@@ -215,7 +215,7 @@ public class LayoutEngine {
private static float getTrailingMargin(CSSNode node, CSSFlexDirection axis) { private static float getTrailingMargin(CSSNode node, CSSFlexDirection axis) {
if (isRowDirection(axis)) { if (isRowDirection(axis)) {
float trailingMargin = getMargin(node, PositionIndex.END); float trailingMargin = node.style.margin.getRaw(Spacing.END);
if (!CSSConstants.isUndefined(trailingMargin)) { if (!CSSConstants.isUndefined(trailingMargin)) {
return trailingMargin; return trailingMargin;
} }
@@ -245,7 +245,7 @@ public class LayoutEngine {
private static float getLeadingPadding(CSSNode node, CSSFlexDirection axis) { private static float getLeadingPadding(CSSNode node, CSSFlexDirection axis) {
if (isRowDirection(axis)) { if (isRowDirection(axis)) {
float leadingPadding = getPadding(node, PositionIndex.START); float leadingPadding = node.style.padding.getRaw(Spacing.START);
if (!CSSConstants.isUndefined(leadingPadding)) { if (!CSSConstants.isUndefined(leadingPadding)) {
return leadingPadding; return leadingPadding;
} }
@@ -256,7 +256,7 @@ public class LayoutEngine {
private static float getTrailingPadding(CSSNode node, CSSFlexDirection axis) { private static float getTrailingPadding(CSSNode node, CSSFlexDirection axis) {
if (isRowDirection(axis)) { if (isRowDirection(axis)) {
float trailingPadding = getPadding(node, PositionIndex.END); float trailingPadding = node.style.padding.getRaw(Spacing.END);
if (!CSSConstants.isUndefined(trailingPadding)) { if (!CSSConstants.isUndefined(trailingPadding)) {
return trailingPadding; return trailingPadding;
} }
@@ -286,7 +286,7 @@ public class LayoutEngine {
private static float getLeadingBorder(CSSNode node, CSSFlexDirection axis) { private static float getLeadingBorder(CSSNode node, CSSFlexDirection axis) {
if (isRowDirection(axis)) { if (isRowDirection(axis)) {
float leadingBorder = getBorder(node, PositionIndex.START); float leadingBorder = node.style.border.getRaw(Spacing.START);
if (!CSSConstants.isUndefined(leadingBorder)) { if (!CSSConstants.isUndefined(leadingBorder)) {
return leadingBorder; return leadingBorder;
} }
@@ -297,7 +297,7 @@ public class LayoutEngine {
private static float getTrailingBorder(CSSNode node, CSSFlexDirection axis) { private static float getTrailingBorder(CSSNode node, CSSFlexDirection axis) {
if (isRowDirection(axis)) { if (isRowDirection(axis)) {
float trailingBorder = getBorder(node, PositionIndex.END); float trailingBorder = node.style.border.getRaw(Spacing.END);
if (!CSSConstants.isUndefined(trailingBorder)) { if (!CSSConstants.isUndefined(trailingBorder)) {
return trailingBorder; return trailingBorder;
} }