diff --git a/dist/css-layout.jar b/dist/css-layout.jar index 9428bb4c..b4ca4e39 100644 Binary files a/dist/css-layout.jar and b/dist/css-layout.jar differ diff --git a/src/csharp/Facebook.CSSLayout/CSSNode.cs b/src/csharp/Facebook.CSSLayout/CSSNode.cs index 736fa289..bc383c2b 100644 --- a/src/csharp/Facebook.CSSLayout/CSSNode.cs +++ b/src/csharp/Facebook.CSSLayout/CSSNode.cs @@ -317,6 +317,12 @@ namespace Facebook.CSSLayout get { return style.flex; } set { updateFloatValue(ref style.flex, value); } } + + public CSSOverflow Overflow + { + get { return style.overflow; } + set { updateDiscreteValue(ref style.overflow, value); } + } public void SetMargin(CSSSpacingType spacingType, float margin) { diff --git a/src/java/src/com/facebook/csslayout/CSSNode.java b/src/java/src/com/facebook/csslayout/CSSNode.java index 011d98ed..d8b5243d 100644 --- a/src/java/src/com/facebook/csslayout/CSSNode.java +++ b/src/java/src/com/facebook/csslayout/CSSNode.java @@ -447,6 +447,62 @@ public class CSSNode { } } + /** + * Get this node's max width, as defined in the style + */ + public float getStyleMaxWidth() { + return style.maxWidth; + } + + public void setStyleMaxWidth(float maxWidth) { + if (!valuesEqual(style.maxWidth, maxWidth)) { + style.maxWidth = maxWidth; + dirty(); + } + } + + /** + * Get this node's min width, as defined in the style + */ + public float getStyleMinWidth() { + return style.minWidth; + } + + public void setStyleMinWidth(float minWidth) { + if (!valuesEqual(style.minWidth, minWidth)) { + style.minWidth = minWidth; + dirty(); + } + } + + /** + * Get this node's max height, as defined in the style + */ + public float getStyleMaxHeight() { + return style.maxHeight; + } + + public void setStyleMaxHeight(float maxHeight) { + if (!valuesEqual(style.maxHeight, maxHeight)) { + style.maxHeight = maxHeight; + dirty(); + } + } + + /** + * Get this node's min height, as defined in the style + */ + public float getStyleMinHeight() { + return style.minHeight; + } + + public void setStyleMinHeight(float minHeight) { + if (!valuesEqual(style.minHeight, minHeight)) { + style.minHeight = minHeight; + dirty(); + } + } + public float getLayoutX() { return layout.position[POSITION_LEFT]; } @@ -476,6 +532,20 @@ public class CSSNode { } } + /** + * Get this node's overflow property, as defined in the style + */ + public CSSOverflow getOverflow() { + return style.overflow; + } + + public void setOverflow(CSSOverflow overflow) { + if (style.overflow != overflow) { + style.overflow = overflow; + dirty(); + } + } + /** * Resets this instance to its default state. This method is meant to be used when * recycling {@link CSSNode} instances.