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

fix-next: restrict to safe area when transform (#6405)

Browse Source
This commit is contained in:
Martin Yankov
2018-10-15 10:17:56 +03:00
committed by GitHub
parent 829d18b56d
commit 7e891a91f9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,6 +159,7 @@ export class View extends ViewCommon {
traceWrite(this + " :_setNativeViewFrame: " + JSON.stringify(ios.getPositionFromFrame(frame)), traceCategories.Layout);
}
this._cachedFrame = frame;
let adjustedFrame = null;
if (this._hasTransfrom) {
// Always set identity transform before setting frame;
const transform = nativeView.transform;
@ -167,11 +168,11 @@ export class View extends ViewCommon {
nativeView.transform = transform;
} else {
nativeView.frame = frame;
}
const adjustedFrame = this.applySafeAreaInsets(frame);
if (adjustedFrame) {
nativeView.frame = adjustedFrame;
// apply safe area insets only if no transform is in place
adjustedFrame = this.applySafeAreaInsets(frame);
if (adjustedFrame) {
nativeView.frame = adjustedFrame;
}
}
const boundsOrigin = nativeView.bounds.origin;