kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 03:50:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync latest code from github

Browse Source 
Differential Revision: D2566417

fb-gh-sync-id: 9eb9fbbb2dfbd5337de128ea4415120faf089aaa
This commit is contained in:
Krzysztof Magiera
2015-10-21 12:51:02 -07:00
committed by facebook-github-bot-9
parent 4036eca570
commit 44ff93e7bf
4 changed files with 122 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputShadowNode.java
View File

@@ -63,7 +63,7 @@ public class ReactTextInputShadowNode extends ReactTextShadowNode implements
setDefaultPadding(Spacing.TOP, mEditText.getPaddingTop());
setDefaultPadding(Spacing.RIGHT, mEditText.getPaddingRight());
setDefaultPadding(Spacing.BOTTOM, mEditText.getPaddingBottom());
mComputedPadding = spacingToFloatArray(getStylePadding());
mComputedPadding = spacingToFloatArray(getPadding());
}
@Override
@@ -76,12 +76,12 @@ public class ReactTextInputShadowNode extends ReactTextShadowNode implements
TypedValue.COMPLEX_UNIT_PX,
mFontSize == UNSET ?
(int) Math.ceil(PixelUtil.toPixelFromSP(ViewDefaults.FONT_SIZE_SP)) : mFontSize);
mComputedPadding = spacingToFloatArray(getStylePadding());
mComputedPadding = spacingToFloatArray(getPadding());
editText.setPadding(
(int) Math.ceil(getStylePadding().get(Spacing.LEFT)),
(int) Math.ceil(getStylePadding().get(Spacing.TOP)),
(int) Math.ceil(getStylePadding().get(Spacing.RIGHT)),
(int) Math.ceil(getStylePadding().get(Spacing.BOTTOM)));
(int) Math.ceil(getPadding().get(Spacing.LEFT)),
(int) Math.ceil(getPadding().get(Spacing.TOP)),
(int) Math.ceil(getPadding().get(Spacing.RIGHT)),
(int) Math.ceil(getPadding().get(Spacing.BOTTOM)));
if (mNumberOfLines != UNSET) {
editText.setLines(mNumberOfLines);
@@ -120,7 +120,7 @@ public class ReactTextInputShadowNode extends ReactTextShadowNode implements
@Override
public void setPadding(int spacingType, float padding) {
super.setPadding(spacingType, padding);
mComputedPadding = spacingToFloatArray(getStylePadding());
mComputedPadding = spacingToFloatArray(getPadding());
markUpdated();
}