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

refactor: add locationInWindow usage

Browse Source
This commit is contained in:
Vasil Chimev
2018-08-30 15:11:22 +03:00
committed by Martin Yankov
parent 9d9e4d350d
commit ea4ace61da
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -770,6 +770,12 @@ export namespace ios {
} }
export function expandBeyondSafeArea(view: View, frame: CGRect): CGRect { export function expandBeyondSafeArea(view: View, frame: CGRect): CGRect {
const locationInWindow = view.getLocationInWindow();
const inWindowLeft = layout.round(layout.toDevicePixels(locationInWindow.x));
const inWindowTop = layout.round(layout.toDevicePixels(locationInWindow.y));
const inWindowRight = inWindowLeft + layout.round(layout.toDevicePixels(frame.size.width));
const inWindowBottom = inWindowTop + layout.round(layout.toDevicePixels(frame.size.height));
const parentWithController = ios.getParentWithViewController(view); const parentWithController = ios.getParentWithViewController(view);
const safeArea = parentWithController.viewController.view.safeAreaLayoutGuide.layoutFrame; const safeArea = parentWithController.viewController.view.safeAreaLayoutGuide.layoutFrame;
const fullscreen = parentWithController.viewController.view.frame; const fullscreen = parentWithController.viewController.view.frame;
@@ -780,19 +786,19 @@ export namespace ios {
const adjustedPosition = position; const adjustedPosition = position;
if (position.left && position.left <= safeAreaPosition.left) { if (position.left && inWindowLeft <= safeAreaPosition.left) {
adjustedPosition.left = fullscreenPosition.left; adjustedPosition.left = fullscreenPosition.left;
} }
if (position.top && position.top <= safeAreaPosition.top) { if (position.top && inWindowTop <= safeAreaPosition.top) {
adjustedPosition.top = fullscreenPosition.top; adjustedPosition.top = fullscreenPosition.top;
} }
if (position.right < fullscreenPosition.right && position.right >= safeAreaPosition.right) { if (inWindowRight < fullscreenPosition.right && inWindowRight >= safeAreaPosition.right) {
adjustedPosition.right = fullscreenPosition.right; adjustedPosition.right = fullscreenPosition.right;
} }
if (position.bottom < fullscreenPosition.bottom && position.bottom >= safeAreaPosition.bottom) { if (inWindowBottom < fullscreenPosition.bottom && inWindowBottom >= safeAreaPosition.bottom) {
adjustedPosition.bottom = fullscreenPosition.bottom; adjustedPosition.bottom = fullscreenPosition.bottom;
} }