Merge pull request unoplatform#15361 from unoplatform/dev/jela/scroll…

…viewer-crash fix: [iOS] Avoid crash when content size is negative
ramezgerges · Feb 6, 2024 · 39f98dd · 39f98dd
2 parents 3c188c0 + c7c0acb
commit 39f98dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/NativeScrollContentPresenter.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/NativeScrollContentPresenter.iOS.cs
@@ -296,8 +296,8 @@ public override void LayoutSubviews()
 						_content.Frame = new CGRect(
 							GetAdjustedArrangeX(iFwElt, adjustedMeasure, (nfloat)contentMargin.Horizontal()),
 							GetAdjustedArrangeY(iFwElt, adjustedMeasure, (nfloat)contentMargin.Vertical()),
-							adjustedMeasure.Width,
-							adjustedMeasure.Height
+							Math.Max(0, adjustedMeasure.Width),
+							Math.Max(0, adjustedMeasure.Height)
 						);
 					}
 				}

diff --git a/src/Uno.UI/UI/Xaml/UIElement.cs b/src/Uno.UI/UI/Xaml/UIElement.cs
@@ -934,8 +934,8 @@ public Size RenderSize
 			get => Visibility == Visibility.Collapsed ? new Size() : _size;
 			internal set
 			{
-				global::System.Diagnostics.Debug.Assert(value.Width >= 0, "Invalid width");
-				global::System.Diagnostics.Debug.Assert(value.Height >= 0, "Invalid height");
+				global::System.Diagnostics.Debug.Assert(value.Width >= 0, $"Invalid width ({value.Width})");
+				global::System.Diagnostics.Debug.Assert(value.Height >= 0, $"Invalid height ({value.Height})");
 				var previousSize = _size;
 				_size = value;
 				if (_size != previousSize)