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

Merge pull request #2950 from NativeScript/raikov/scale

Browse Source 
Added support for scale(x)
This commit is contained in:
Vladimir Enchev
2016-10-27 15:08:34 +03:00
committed by GitHub
parent 4045bb2cd6 0292a49ea2
commit fd23197851
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,8 +490,8 @@ export class Style extends DependencyObservable implements styling.Style {
} }
get borderColor(): string | Color { get borderColor(): string | Color {
if (Color.equals(this.borderTopColor, this.borderRightColor) && if (Color.equals(this.borderTopColor, this.borderRightColor) &&
Color.equals(this.borderTopColor, this.borderBottomColor) && Color.equals(this.borderTopColor, this.borderBottomColor) &&
Color.equals(this.borderTopColor, this.borderLeftColor)){ Color.equals(this.borderTopColor, this.borderLeftColor)){
return this.borderTopColor; return this.borderTopColor;
} }
@ -535,8 +535,8 @@ export class Style extends DependencyObservable implements styling.Style {
} }
get borderWidth(): string | number { get borderWidth(): string | number {
if (this.borderTopWidth === this.borderRightWidth && if (this.borderTopWidth === this.borderRightWidth &&
this.borderTopWidth === this.borderBottomWidth && this.borderTopWidth === this.borderBottomWidth &&
this.borderTopWidth === this.borderLeftWidth){ this.borderTopWidth === this.borderLeftWidth){
return this.borderTopWidth; return this.borderTopWidth;
} }
@ -577,8 +577,8 @@ export class Style extends DependencyObservable implements styling.Style {
} }
get borderRadius(): string | number { get borderRadius(): string | number {
if (this.borderTopLeftRadius === this.borderTopRightRadius && if (this.borderTopLeftRadius === this.borderTopRightRadius &&
this.borderTopLeftRadius === this.borderBottomRightRadius && this.borderTopLeftRadius === this.borderBottomRightRadius &&
this.borderTopLeftRadius === this.borderBottomLeftRadius){ this.borderTopLeftRadius === this.borderBottomLeftRadius){
return this.borderTopLeftRadius; return this.borderTopLeftRadius;
} }
@ -1275,10 +1275,14 @@ function onTransformChanged(value: any): Array<styleProperty.KeyValuePair<styleP
case "scale": case "scale":
case "scale3d": case "scale3d":
values = newTransform[transform].split(","); values = newTransform[transform].split(",");
if (values.length === 2 || values.length === 3) { if (values.length >= 2) {
array.push({ property: scaleXProperty, value: parseFloat(values[0]) }); array.push({ property: scaleXProperty, value: parseFloat(values[0]) });
array.push({ property: scaleYProperty, value: parseFloat(values[1]) }); array.push({ property: scaleYProperty, value: parseFloat(values[1]) });
} }
else if (values.length === 1) {
array.push({ property: scaleXProperty, value: parseFloat(values[0]) });
array.push({ property: scaleYProperty, value: parseFloat(values[0]) });
}
break; break;
case "translateX": case "translateX":
array.push({ property: translateXProperty, value: parseFloat(newTransform[transform]) }); array.push({ property: translateXProperty, value: parseFloat(newTransform[transform]) });
@ -1289,10 +1293,14 @@ function onTransformChanged(value: any): Array<styleProperty.KeyValuePair<styleP
case "translate": case "translate":
case "translate3d": case "translate3d":
values = newTransform[transform].split(","); values = newTransform[transform].split(",");
if (values.length === 2 || values.length === 3) { if (values.length >= 2) {
array.push({ property: translateXProperty, value: parseFloat(values[0]) }); array.push({ property: translateXProperty, value: parseFloat(values[0]) });
array.push({ property: translateYProperty, value: parseFloat(values[1]) }); array.push({ property: translateYProperty, value: parseFloat(values[1]) });
} }
else if (values.length === 1) {
array.push({ property: translateXProperty, value: parseFloat(values[0]) });
array.push({ property: translateYProperty, value: parseFloat(values[0]) });
}
break; break;
case "rotate": case "rotate":
let text = newTransform[transform]; let text = newTransform[transform];
@ -1611,40 +1619,40 @@ function parseThickness(value: any): definition.Thickness {
if (types.isString(value)) { if (types.isString(value)) {
let arr = value.split(/[ ,]+/); let arr = value.split(/[ ,]+/);
if (arr.length === 1){ if (arr.length === 1){
let arr0 = parseInt(arr[0]); let arr0 = parseInt(arr[0]);
result.top = arr0; result.top = arr0;
result.right = arr0; result.right = arr0;
result.bottom = arr0; result.bottom = arr0;
result.left = arr0; result.left = arr0;
} }
else if (arr.length === 2){ else if (arr.length === 2){
let arr0 = parseInt(arr[0]); let arr0 = parseInt(arr[0]);
let arr1 = parseInt(arr[1]); let arr1 = parseInt(arr[1]);
result.top = arr0; result.top = arr0;
result.right = arr1; result.right = arr1;
result.bottom = arr0; result.bottom = arr0;
result.left = arr1; result.left = arr1;
} }
else if (arr.length === 3){ else if (arr.length === 3){
let arr0 = parseInt(arr[0]); let arr0 = parseInt(arr[0]);
let arr1 = parseInt(arr[1]); let arr1 = parseInt(arr[1]);
let arr2 = parseInt(arr[2]); let arr2 = parseInt(arr[2]);
result.top = arr0; result.top = arr0;
result.right = arr1; result.right = arr1;
result.bottom = arr2; result.bottom = arr2;
result.left = arr1; result.left = arr1;
} }
else if (arr.length === 4){ else if (arr.length === 4){
let arr0 = parseInt(arr[0]); let arr0 = parseInt(arr[0]);
let arr1 = parseInt(arr[1]); let arr1 = parseInt(arr[1]);
let arr2 = parseInt(arr[2]); let arr2 = parseInt(arr[2]);
let arr3 = parseInt(arr[3]); let arr3 = parseInt(arr[3]);
result.top = arr0; result.top = arr0;
result.right = arr1; result.right = arr1;
result.bottom = arr2; result.bottom = arr2;
result.left = arr3; result.left = arr3;
} }
} }
else if (types.isNumber(value)) { else if (types.isNumber(value)) {
result.top = result.right = result.bottom = result.left = value; result.top = result.right = result.bottom = result.left = value;
} }
@ -1661,7 +1669,7 @@ function parseBorderColor(value: any): definition.BorderColor {
if (types.isString(value)) { if (types.isString(value)) {
if (value.indexOf("rgb") === 0){ if (value.indexOf("rgb") === 0){
result.top = result.right = result.bottom = result.left = new Color(value); result.top = result.right = result.bottom = result.left = new Color(value);
return result; return result;
} }
let arr = value.split(/[ ,]+/); let arr = value.split(/[ ,]+/);
@ -1699,7 +1707,7 @@ function parseBorderColor(value: any): definition.BorderColor {
result.bottom = arr2; result.bottom = arr2;
result.left = arr3; result.left = arr3;
} }
} }
else if (value instanceof Color) { else if (value instanceof Color) {
result.top = result.right = result.bottom = result.left = value; result.top = result.right = result.bottom = result.left = value;
} }