Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified dist/css-layout.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions src/csharp/Facebook.CSSLayout/CSSNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,12 @@ public float Flex
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)
{
Expand Down
70 changes: 70 additions & 0 deletions src/java/src/com/facebook/csslayout/CSSNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,62 @@ public void setStyleHeight(float height) {
}
}

/**
* 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];
}
Expand Down Expand Up @@ -476,6 +532,20 @@ public void setDefaultPadding(int spacingType, float padding) {
}
}

/**
* 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.
Expand Down