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

fix safe area for ios 10 and less

Browse Source
This commit is contained in:
Martin Yankov
2018-07-13 15:41:35 +03:00
parent ef4489781e
commit cddc0a682a
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,8 @@ const PFLAG_FORCE_LAYOUT = 1;
const PFLAG_MEASURED_DIMENSION_SET = 1 << 1;
const PFLAG_LAYOUT_REQUIRED = 1 << 2;
const majorVersion = iosUtils.MajorVersion;
export class View extends ViewCommon {
nativeViewProtected: UIView;
viewController: UIViewController;
@@ -87,14 +89,13 @@ export class View extends ViewCommon {
const { boundsChanged, sizeChanged } = this._setCurrentLayoutBounds(left, top, right, bottom);
let actualPosition = {left, top, right, bottom};
if (setFrame) {
// The actual position of a native view can change in case of safe area violation or expansion
actualPosition = this.layoutNativeView(left, top, right, bottom) || actualPosition;
}
if (boundsChanged || (this._privateFlags & PFLAG_LAYOUT_REQUIRED) === PFLAG_LAYOUT_REQUIRED) {
let insets = { left: 0, top: 0, right: 0, bottom: 0};
if (this.nativeViewProtected.safeAreaInsets) {
if (majorVersion > 10) {
insets.left = layout.toDevicePixels(this.nativeViewProtected.safeAreaInsets.left);
insets.top = layout.toDevicePixels(this.nativeViewProtected.safeAreaInsets.top);
insets.right = layout.toDevicePixels(this.nativeViewProtected.safeAreaInsets.right);
@@ -740,15 +741,15 @@ export namespace ios {
fullscreenSize.height -= (statusBarHeight + navBarHeight);
}
// left = safeOrigin.x;
// width = safeAreaSize.width;
// top = safeOrigin.y;
// height = safeAreaSize.height;
left = safeOrigin.x;
width = safeAreaSize.width;
top = safeOrigin.y;
height = safeAreaSize.height;
left = fullscreenOrigin.x;
width = fullscreenSize.width;
top = fullscreenOrigin.y;
height = fullscreenSize.height;
// left = fullscreenOrigin.x;
// width = fullscreenSize.width;
// top = fullscreenOrigin.y;
// height = fullscreenSize.height;
// if (hasChildControllers) {
// // If not inner most extend to fullscreen

9
tns-core-modules/ui/layouts/layout-base.ios.ts
View File

@@ -1,9 +1,12 @@
import {
LayoutBaseCommon, clipToBoundsProperty, isPassThroughParentEnabledProperty, View, layout
} from "./layout-base-common";
import { ios as iosUtils } from "../../utils/utils";
export * from "./layout-base-common";
const majorVersion = iosUtils.MajorVersion;
export class LayoutBase extends LayoutBaseCommon {
nativeViewProtected: UIView;
@@ -60,6 +63,7 @@ export class LayoutBase extends LayoutBaseCommon {
let width = layout.toDevicePixels(frame.size.width);
let height = layout.toDevicePixels(frame.size.height);
if (majorVersion > 10) {
let newLeft = left;
let newTop = top;
let newWidth = width;
@@ -86,6 +90,7 @@ export class LayoutBase extends LayoutBaseCommon {
const frameNew = CGRectMake(layout.toDeviceIndependentPixels(newLeft), layout.toDeviceIndependentPixels(newTop), layout.toDeviceIndependentPixels(newWidth), layout.toDeviceIndependentPixels(newHeight));
nativeView.frame = frameNew;
}
// if (leftInset || topInset) {
// const frameNew = CGRectMake(layout.toDeviceIndependentPixels(left), layout.toDeviceIndependentPixels(top), layout.toDeviceIndependentPixels(right - left + leftInset), layout.toDeviceIndependentPixels(bottom - top + topInset));
@@ -95,11 +100,11 @@ export class LayoutBase extends LayoutBaseCommon {
// }
// else {
const boundsOrigin = nativeView.bounds.origin;
nativeView.bounds = CGRectMake(boundsOrigin.x, boundsOrigin.y, frameNew.size.width, frameNew.size.height);
nativeView.bounds = CGRectMake(boundsOrigin.x, boundsOrigin.y, nativeView.frame.size.width, nativeView.frame.size.height);
// }
// }
return frameNew;
return nativeView.frame;
}
[clipToBoundsProperty.getDefault](): boolean {