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

Fixed: Android layerType should not be changed if there is no need

Browse Source 
Resolves #1899
This commit is contained in:
Rossen Hristov
2016-05-30 09:48:50 +03:00
parent 153650fb47
commit e2f1e272b4
4 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,8 +225,14 @@ export module ad {
var _defaultBackgrounds = new Map<string, android.graphics.drawable.Drawable>();
interface CacheLayerType {
layerType: number;
}
export function onBackgroundOrBorderPropertyChanged(v: view.View) {
var nativeView = <android.view.View>v._nativeView;
var cache = <CacheLayerType>v._nativeView;
if (!nativeView) {
return;
}
@@ -265,14 +271,12 @@ export module ad {
bkg.background = backgroundValue;
bkg.clipPath = clipPathValue;
if (getSDK() < 18) {
if ((v.borderWidth !== 0 || v.borderRadius !== 0 || clipPathValue) && getSDK() < 18) {
// Switch to software because of unsupported canvas methods if hardware acceleration is on:
// http://developer.android.com/guide/topics/graphics/hardware-accel.html
cache.layerType = nativeView.getLayerType();
nativeView.setLayerType(android.view.View.LAYER_TYPE_SOFTWARE, null);
}
else {
nativeView.setLayerType(android.view.View.LAYER_TYPE_HARDWARE, null);
}
}
else {
// reset the value with the default native value
@@ -287,9 +291,10 @@ export module ad {
}
}
if (getSDK() < 18) {
// Reset layer type to hardware
nativeView.setLayerType(android.view.View.LAYER_TYPE_HARDWARE, null);
if (cache.layerType !== undefined) {
// Reset layer type
nativeView.setLayerType(cache.layerType, null);
cache.layerType = undefined;
}
}

8
tns-core-modules/ui/styling/style.ts
View File

@@ -405,9 +405,11 @@ function isPaddingValid(value: number): boolean {
var supportedPaths = ["rect", "circle", "ellipse", "polygon"];
function isClipPathValid(value: string): boolean {
if (!value){
return true;
}
var functionName = value.substring(0, value.indexOf("(")).trim();
return supportedPaths.indexOf(functionName) !== -1 || value === "";
return supportedPaths.indexOf(functionName) !== -1;
}
function isMarginValid(value: number): boolean {
@@ -921,7 +923,7 @@ export class Style extends DependencyObservable implements styling.Style {
}
private _applyStyleProperty(property: Property, newValue: any) {
if (!this._view._shouldApplyStyleHandlers()) {
return;
}