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

fix-next: apply ios safe area before transform (#6443)

Browse Source
This commit is contained in:
Martin Yankov
2018-10-23 13:38:02 +03:00
committed by GitHub
parent a58fc528b2
commit dfa208a54d
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,19 +160,24 @@ export class View extends ViewCommon {
} }
this._cachedFrame = frame; this._cachedFrame = frame;
let adjustedFrame = null; let adjustedFrame = null;
let transform = null;
if (this._hasTransfrom) { if (this._hasTransfrom) {
// Always set identity transform before setting frame; // Always set identity transform before setting frame;
const transform = nativeView.transform; transform = nativeView.transform;
nativeView.transform = CGAffineTransformIdentity; nativeView.transform = CGAffineTransformIdentity;
nativeView.frame = frame; nativeView.frame = frame;
nativeView.transform = transform;
} else { } else {
nativeView.frame = frame; nativeView.frame = frame;
// apply safe area insets only if no transform is in place }
adjustedFrame = this.applySafeAreaInsets(frame);
if (adjustedFrame) { adjustedFrame = this.applySafeAreaInsets(frame);
nativeView.frame = adjustedFrame; if (adjustedFrame) {
} nativeView.frame = adjustedFrame;
}
if (this._hasTransfrom) {
// re-apply the transform after the frame is adjusted
nativeView.transform = transform;
} }
const boundsOrigin = nativeView.bounds.origin; const boundsOrigin = nativeView.bounds.origin;