From 74c72111f12aa386378ef531485afba62bcd16d1 Mon Sep 17 00:00:00 2001 From: Denis Koroskin Date: Thu, 28 Jan 2016 15:12:09 -0800 Subject: [PATCH] Rename mIsOverflowVisible to a more descriptive mClipToBounds Summary: A simple refactoring diff that should make code a little easier to read. No functional changes. Reviewed By: ahmedre Differential Revision: D2867718 --- .../main/java/com/facebook/react/flat/FlatShadowNode.java | 8 ++++---- .../main/java/com/facebook/react/flat/StateBuilder.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java index f331d1933..67ea71237 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/FlatShadowNode.java @@ -48,7 +48,7 @@ import com.facebook.react.uimanager.ViewProps; private @Nullable DrawView mDrawView; private @Nullable DrawBackgroundColor mDrawBackground; private int mMoveToIndexInParent; - private boolean mIsOverflowVisible = true; + private boolean mClipToBounds = false; /* package */ void handleUpdateProperties(ReactStylesDiffMap styles) { if (!mountsToView()) { @@ -101,12 +101,12 @@ import com.facebook.react.uimanager.ViewProps; @ReactProp(name = "overflow") public void setOverflow(String overflow) { - mIsOverflowVisible = "visible".equals(overflow); + mClipToBounds = "hidden".equals(overflow); invalidate(); } - public final boolean isOverflowVisible() { - return mIsOverflowVisible; + public final boolean clipToBounds() { + return mClipToBounds; } @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java index de5a3275c..15e7b3d49 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/StateBuilder.java @@ -375,7 +375,7 @@ import com.facebook.react.uimanager.events.EventDispatcher; node.collectState(this, left, top, right, bottom, clipLeft, clipTop, clipRight, clipBottom); - if (node.isOverflowVisible()) { + if (!node.clipToBounds()) { clipLeft = parentClipLeft; clipTop = parentClipTop; clipRight = parentClipRight;