FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix-next: restrict to safe area when transform by MartoYankov · Pull Request #6405 · NativeScript/NativeScript · GitHub

/ NativeScript Public

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartoYankov merged 1 commit into from
Oct 15, 2018
Conversation 4 Commits 1 Checks 0 Files changed
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .ts  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
11 changes: 6 additions & 5 deletions tns-core-modules/ui/core/view/view.ios.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Back | FazBrowse Home | New Git URL