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 #1365 from NativeScript/page-background-color-android

Browse Source 
Page background-color for Android fixed
This commit is contained in:
Vladimir Enchev
2016-01-13 11:12:45 +02:00
parent 7c9eeaa919 c0ba0357e0
commit d932e8a9df
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ui/styling/background.android.ts
View File

@ -153,17 +153,16 @@ export module ad {
var backgroundValue = v.style._getValue(style.backgroundInternalProperty); var backgroundValue = v.style._getValue(style.backgroundInternalProperty);
var borderWidth = v.borderWidth; var borderWidth = v.borderWidth;
var bkg = <any>nativeView.getBackground();
if (v.borderWidth === 0 && v.borderRadius === 0 && if (!types.isNullOrUndefined(bkg) && v.borderWidth === 0 && v.borderRadius === 0 &&
!v.style._getValue(style.backgroundImageProperty) && !v.style._getValue(style.backgroundImageProperty) &&
v.style._getValue(style.backgroundColorProperty)) { v.style._getValue(style.backgroundColorProperty)) {
let bkg = nativeView.getBackground();
if (bkg && bkg.setColorFilter) { if (bkg && bkg.setColorFilter) {
bkg.setColorFilter(v.style._getValue(style.backgroundColorProperty).android, android.graphics.PorterDuff.Mode.SRC_IN); bkg.setColorFilter(v.style._getValue(style.backgroundColorProperty).android, android.graphics.PorterDuff.Mode.SRC_IN);
} }
} else if (v.borderWidth !== 0 || v.borderRadius !== 0 || !backgroundValue.isEmpty()) { } else if (v.borderWidth !== 0 || v.borderRadius !== 0 || !backgroundValue.isEmpty()) {
let bkg = <any>nativeView.getBackground();
if (!(bkg instanceof dts.ad.BorderDrawable)) { if (!(bkg instanceof dts.ad.BorderDrawable)) {
bkg = new dts.ad.BorderDrawable(); bkg = new dts.ad.BorderDrawable();
let viewClass = types.getClass(v); let viewClass = types.getClass(v);