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

Merge pull request #3979 from NativeScript/fix-ios-zero-scale

Browse Source 
Setting scale to 0 in iOS was actually using 0, it will now use 1e-6
This commit is contained in:
Panayot Cankov
2017-04-12 11:12:58 +03:00
committed by GitHub
parent 837871a3c9 078bd48909
commit 7108fc6954
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,13 +234,13 @@ export class View extends ViewCommon {
public updateNativeTransform() { public updateNativeTransform() {
let translateX = layout.toDeviceIndependentPixels(Length.toDevicePixels(this.translateX || 0, 0)); let translateX = layout.toDeviceIndependentPixels(Length.toDevicePixels(this.translateX || 0, 0));
let translateY = layout.toDeviceIndependentPixels(Length.toDevicePixels(this.translateY || 0, 0)); let translateY = layout.toDeviceIndependentPixels(Length.toDevicePixels(this.translateY || 0, 0));
let scaleX = this.scaleX || 1; let scaleX = this.scaleX || 1e-6;
let scaleY = this.scaleY || 1; let scaleY = this.scaleY || 1e-6;
let rotate = this.rotate || 0; let rotate = this.rotate || 0;
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 === 0 ? 0.001 : scaleX, scaleY === 0 ? 0.001 : scaleY); newTransform = CGAffineTransformScale(newTransform, scaleX, scaleY);
if (!CGAffineTransformEqualToTransform(this.nativeView.transform, newTransform)) { if (!CGAffineTransformEqualToTransform(this.nativeView.transform, newTransform)) {
let updateSuspended = this._isPresentationLayerUpdateSuspeneded(); let updateSuspended = this._isPresentationLayerUpdateSuspeneded();
if (!updateSuspended) { if (!updateSuspended) {