javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2128 from NativeScript/android-background-reset

Browse Source 
android background reset fixed
This commit is contained in:
Vladimir Enchev
2016-05-17 17:11:14 +03:00
parent f10666e1f0 60a6c9b12d
commit bd8878842a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,13 +241,13 @@ export module ad {
var bkg = <any>nativeView.getBackground(); var bkg = <any>nativeView.getBackground();
if (v instanceof button.Button && !types.isNullOrUndefined(bkg) && types.isFunction(bkg.setColorFilter) && if (v instanceof button.Button && !types.isNullOrUndefined(bkg) && types.isFunction(bkg.setColorFilter) &&
v.borderWidth === 0 && v.borderRadius === 0 && v.borderWidth === 0 && v.borderRadius === 0 && !clipPathValue &&
types.isNullOrUndefined(v.style._getValue(style.backgroundImageProperty)) && types.isNullOrUndefined(v.style._getValue(style.backgroundImageProperty)) &&
!types.isNullOrUndefined(v.style._getValue(style.backgroundColorProperty))) { !types.isNullOrUndefined(v.style._getValue(style.backgroundColorProperty))) {
let backgroundColor = bkg.backgroundColor = v.style._getValue(style.backgroundColorProperty).android; let backgroundColor = bkg.backgroundColor = v.style._getValue(style.backgroundColorProperty).android;
bkg.setColorFilter(backgroundColor, android.graphics.PorterDuff.Mode.SRC_IN); bkg.setColorFilter(backgroundColor, android.graphics.PorterDuff.Mode.SRC_IN);
bkg.backgroundColor = backgroundColor; bkg.backgroundColor = backgroundColor;
} else if (v.borderWidth !== 0 || v.borderRadius !== 0 || !backgroundValue.isEmpty() || !clipPathValue.isEmpty()) { } else if (v.borderWidth !== 0 || v.borderRadius !== 0 || !backgroundValue.isEmpty() || clipPathValue) {
if (!(bkg instanceof BorderDrawableClass)) { if (!(bkg instanceof BorderDrawableClass)) {
bkg = new BorderDrawableClass(); bkg = new BorderDrawableClass();