javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2719 from NativeScript/zhecheva/p-test

Browse Source 
Padding is not reset if an element has a border-related property set
This commit is contained in:
Maya Zhecheva
2016-09-16 14:40:46 +03:00
committed by GitHub
parent e3e54e0ade 51bfa93879
commit e8901e8ced
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tns-core-modules/ui/styling/background.android.ts
View File

@ -101,11 +101,16 @@ export module ad {
}
}
let leftPadding = v.style.paddingLeft ? v.style.paddingLeft : nativeView.getPaddingLeft() / density;
let topPadding = v.style.paddingTop ? v.style.paddingTop : nativeView.getPaddingTop() / density;
let rightPadding = v.style.paddingRight ? v.style.paddingRight : nativeView.getPaddingRight() / density;
let bottomPadding = v.style.paddingBottom ? v.style.paddingBottom : nativeView.getPaddingBottom() / density;
nativeView.setPadding(
Math.round((background.borderWidth + v.style.paddingLeft) * density),
Math.round((background.borderWidth + v.style.paddingTop) * density),
Math.round((background.borderWidth + v.style.paddingRight) * density),
Math.round((background.borderWidth + v.style.paddingBottom) * density)
Math.round((background.borderWidth + leftPadding) * density),
Math.round((background.borderWidth + topPadding) * density),
Math.round((background.borderWidth + rightPadding) * density),
Math.round((background.borderWidth + bottomPadding) * density)
);
}
}