fix-next: restrict to safe area when transform (#6405) · NativeScript/NativeScript@7e891a9 · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 774
• Pull requests 71
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 7e891a9

Browse filesBrowse the repository at this point in the historyBrowse files

MartoYankov

authored

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

1 parent 829d18b commit 7e891a9
Copy full SHA for 7e891a9

1 file changed

+6-5Lines changed: 6 additions & 5 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/ui/core/view
  • view.ios.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tns-core-modules/ui/core/view/view.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/core/view/view.ios.ts

+6-5Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
@@ -159,6 +159,7 @@ export class View extends ViewCommon {
159	159	traceWrite(this + " :_setNativeViewFrame: " + JSON.stringify(ios.getPositionFromFrame(frame)), traceCategories.Layout);
160	160	}
161	161	this._cachedFrame = frame;
	162	+ let adjustedFrame = null;
162	163	if (this._hasTransfrom) {
163	164	// Always set identity transform before setting frame;
164	165	const transform = nativeView.transform;
@@ -167,11 +168,11 @@ export class View extends ViewCommon {
167	168	nativeView.transform = transform;
168	169	} else {
169	170	nativeView.frame = frame;
170		- }
171		-
172		- const adjustedFrame = this.applySafeAreaInsets(frame);
173		- if (adjustedFrame) {
174		- nativeView.frame = adjustedFrame;
	171	+ // apply safe area insets only if no transform is in place
	172	+ adjustedFrame = this.applySafeAreaInsets(frame);
	173	+ if (adjustedFrame) {
	174	+ nativeView.frame = adjustedFrame;
	175	+ }
175	176	}
176	177
177	178	const boundsOrigin = nativeView.bounds.origin;

0 commit comments

Comments

0 (0)