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

fix(layout): prevent negative width/height values (#10616)

Browse Source
This commit is contained in:
Igor Randjelovic
2024-09-03 17:59:03 +02:00
committed by GitHub
parent 7b4cb8419c
commit 050601232a
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/core/ui/core/view/view-helper/index.ios.ts
View File

@ -261,9 +261,14 @@ export class IOSHelper {
const left = layout.toDeviceIndependentPixels(position.left + insets.left); const left = layout.toDeviceIndependentPixels(position.left + insets.left);
const top = layout.toDeviceIndependentPixels(position.top + insets.top); const top = layout.toDeviceIndependentPixels(position.top + insets.top);
const width = layout.toDeviceIndependentPixels(position.right - position.left - insets.left - insets.right); let width = layout.toDeviceIndependentPixels(position.right - position.left - insets.left - insets.right);
const height = layout.toDeviceIndependentPixels(position.bottom - position.top - insets.top - insets.bottom); let height = layout.toDeviceIndependentPixels(position.bottom - position.top - insets.top - insets.bottom);
if (width < 0) {
width = 0;
}
if (height < 0) {
height = 0;
}
return CGRectMake(left, top, width, height); return CGRectMake(left, top, width, height);
} }

6
packages/core/ui/core/view/view-helper/view-helper-common.ts
View File

@ -82,6 +82,9 @@ export class ViewHelper {
default: default:
childTop = top + effectiveMarginTop; childTop = top + effectiveMarginTop;
childHeight = bottom - top - (effectiveMarginTop + effectiveMarginBottom); childHeight = bottom - top - (effectiveMarginTop + effectiveMarginBottom);
if (childHeight < 0) {
childHeight = 0;
}
break; break;
} }
@ -112,6 +115,9 @@ export class ViewHelper {
default: default:
childLeft = left + effectiveMarginLeft; childLeft = left + effectiveMarginLeft;
childWidth = right - left - (effectiveMarginLeft + effectiveMarginRight); childWidth = right - left - (effectiveMarginLeft + effectiveMarginRight);
if (childWidth < 0) {
childWidth = 0;
}
break; break;
} }