More fixes

This commit is contained in:
2026-01-17 05:22:37 +00:00
parent f62d4aa5f2
commit 7d2ac327a3
58 changed files with 754 additions and 666 deletions

View File

@@ -103,19 +103,19 @@ public class SkiaBoxView : SkiaView
#region Measurement
protected override SKSize MeasureOverride(SKSize availableSize)
protected override Size MeasureOverride(Size availableSize)
{
// BoxView uses explicit size or a default size when in unbounded context
var width = WidthRequest >= 0 ? (float)WidthRequest :
(float.IsInfinity(availableSize.Width) ? 40f : availableSize.Width);
var height = HeightRequest >= 0 ? (float)HeightRequest :
(float.IsInfinity(availableSize.Height) ? 40f : availableSize.Height);
var width = WidthRequest >= 0 ? WidthRequest :
(double.IsInfinity(availableSize.Width) ? 40.0 : availableSize.Width);
var height = HeightRequest >= 0 ? HeightRequest :
(double.IsInfinity(availableSize.Height) ? 40.0 : availableSize.Height);
// Ensure no NaN values
if (float.IsNaN(width)) width = 40f;
if (float.IsNaN(height)) height = 40f;
if (double.IsNaN(width)) width = 40.0;
if (double.IsNaN(height)) height = 40.0;
return new SKSize(width, height);
return new Size(width, height);
}
#endregion