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

Fixed: Animations look wrong when applying 0 scale

Browse Source
This commit is contained in:
Tsvetan Raikov
2016-06-22 13:07:15 +03:00
parent 9707a505c0
commit b018ac20f0
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tns-core-modules/ui/animation/animation.ios.ts
View File

@ -77,8 +77,8 @@ class AnimationDelegateImpl extends NSObject {
targetStyle._setValue(style.translateYProperty, value.y, valueSource); targetStyle._setValue(style.translateYProperty, value.y, valueSource);
break; break;
case common.Properties.scale: case common.Properties.scale:
targetStyle._setValue(style.scaleXProperty, value.x, valueSource); targetStyle._setValue(style.scaleXProperty, value.x === 0 ? 0.001 : value.x, valueSource);
targetStyle._setValue(style.scaleYProperty, value.y, valueSource); targetStyle._setValue(style.scaleYProperty, value.y === 0 ? 0.001 : value.y, valueSource);
break; break;
case _transform: case _transform:
if (value[common.Properties.translate] !== undefined) { if (value[common.Properties.translate] !== undefined) {
@ -86,8 +86,10 @@ class AnimationDelegateImpl extends NSObject {
targetStyle._setValue(style.translateYProperty, value[common.Properties.translate].y, valueSource); targetStyle._setValue(style.translateYProperty, value[common.Properties.translate].y, valueSource);
} }
if (value[common.Properties.scale] !== undefined) { if (value[common.Properties.scale] !== undefined) {
targetStyle._setValue(style.scaleXProperty, value[common.Properties.scale].x, valueSource); let x = value[common.Properties.scale].x;
targetStyle._setValue(style.scaleYProperty, value[common.Properties.scale].y, valueSource); let y = value[common.Properties.scale].y;
targetStyle._setValue(style.scaleXProperty, x === 0 ? 0.001 : x, valueSource);
targetStyle._setValue(style.scaleYProperty, y === 0 ? 0.001 : y, valueSource);
} }
break; break;
} }
@ -276,6 +278,12 @@ export class Animation extends common.Animation implements definition.Animation
value = NSValue.valueWithCATransform3D(CATransform3DTranslate(nativeView.layer.transform, value.x, value.y, 0)); value = NSValue.valueWithCATransform3D(CATransform3DTranslate(nativeView.layer.transform, value.x, value.y, 0));
break; break;
case common.Properties.scale: case common.Properties.scale:
if (value.x === 0) {
value.x = 0.001;
}
if (value.y === 0) {
value.y = 0.001;
}
animation._originalValue = { x: animation.target.scaleX, y: animation.target.scaleY }; animation._originalValue = { x: animation.target.scaleX, y: animation.target.scaleY };
animation._propertyResetCallback = (value, valueSource) => { animation._propertyResetCallback = (value, valueSource) => {
animation.target.style._setValue(style.scaleXProperty, value.x, valueSource); animation.target.style._setValue(style.scaleXProperty, value.x, valueSource);
@ -453,7 +461,7 @@ export class Animation extends common.Animation implements definition.Animation
if (value[common.Properties.scale] !== undefined) { if (value[common.Properties.scale] !== undefined) {
let x = value[common.Properties.scale].x; let x = value[common.Properties.scale].x;
let y = value[common.Properties.scale].y; let y = value[common.Properties.scale].y;
result = CATransform3DScale(result, x, y, 1); result = CATransform3DScale(result, x === 0 ? 0.001 : x, y === 0 ? 0.001 : y, 1);
} }
return result; return result;

2
tns-core-modules/ui/core/view.ios.ts
View File

@ -291,7 +291,7 @@ export class View extends viewCommon.View {
let newTransform = CGAffineTransformIdentity; let newTransform = CGAffineTransformIdentity;
newTransform = CGAffineTransformTranslate(newTransform, translateX, translateY); newTransform = CGAffineTransformTranslate(newTransform, translateX, translateY);
newTransform = CGAffineTransformRotate(newTransform, rotate * Math.PI / 180); newTransform = CGAffineTransformRotate(newTransform, rotate * Math.PI / 180);
newTransform = CGAffineTransformScale(newTransform, scaleX, scaleY); newTransform = CGAffineTransformScale(newTransform, scaleX === 0 ? 0.001 : scaleX, scaleY === 0 ? 0.001 : scaleY);
if (!CGAffineTransformEqualToTransform(this._nativeView.transform, newTransform)) { if (!CGAffineTransformEqualToTransform(this._nativeView.transform, newTransform)) {
this._nativeView.transform = newTransform; this._nativeView.transform = newTransform;
this._hasTransfrom = this._nativeView && !CGAffineTransformEqualToTransform(this._nativeView.transform, CGAffineTransformIdentity); this._hasTransfrom = this._nativeView && !CGAffineTransformEqualToTransform(this._nativeView.transform, CGAffineTransformIdentity);