status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Apply padding to RCTText 

Summary: When padding is applied to RCTText, the text it renders should be offset by that padding. This is what iOS is doing.

Reviewed By: sriramramani

Differential Revision: D2872039
This commit is contained in:
Denis Koroskin 2016-01-28 17:31:23 -08:00 committed by Ahmed El-Helw
parent d854a17d2a
commit d9ed1a84c5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java
View File

@ -20,11 +20,12 @@ import android.text.TextUtils;
import com.facebook.csslayout.CSSNode;
import com.facebook.csslayout.MeasureOutput;
import com.facebook.csslayout.Spacing;
import com.facebook.fbui.widget.text.staticlayouthelper.StaticLayoutHelper;
import com.facebook.react.uimanager.PixelUtil;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.uimanager.ViewDefaults;
import com.facebook.react.uimanager.ViewProps;
import com.facebook.react.uimanager.annotations.ReactProp;
/**
* RCTText is a top-level node for text. It extends {@link RCTVirtualText} because it can contain
@ -66,7 +67,6 @@ import com.facebook.react.uimanager.ViewProps;
@Override
public void measure(CSSNode node, float width, float height, MeasureOutput measureOutput) {
CharSequence text = getText();
if (TextUtils.isEmpty(text)) {
// to indicate that we don't have anything to display
mText = null;
@ -180,6 +180,11 @@ import com.facebook.react.uimanager.ViewProps;
INCLUDE_PADDING));
}
Spacing padding = getPadding();
left += padding.get(Spacing.LEFT);
top += padding.get(Spacing.TOP);
// these are actual right/bottom coordinates where this DrawCommand will draw.
float layoutRight = left + mDrawCommand.getLayoutWidth();
float layoutBottom = top + mDrawCommand.getLayoutHeight();