From 8c457a0e14f2b9c0df50092ca2fb3b8feebd7bfc Mon Sep 17 00:00:00 2001 From: Samantha Houts Date: Fri, 17 Feb 2017 16:41:35 -0800 Subject: [PATCH] [iOS] Label should not return infinite width --- Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs index 4cf3be9..b8b81e9 100644 --- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs @@ -37,8 +37,9 @@ namespace Xamarin.Forms.Platform.MacOS result.Minimum = new Size(Math.Min(10, result.Request.Width), result.Request.Height); if (Element.LineBreakMode != LineBreakMode.NoWrap) { - if (result.Request.Width > widthConstraint || Element.LineBreakMode == LineBreakMode.WordWrap || Element.LineBreakMode == LineBreakMode.CharacterWrap) - result.Request = new Size(Math.Max(result.Minimum.Width, widthConstraint), result.Request.Height); + if (!double.IsInfinity(result.Request.Width) && !double.IsInfinity(widthConstraint)) + if (result.Request.Width > widthConstraint || Element.LineBreakMode == LineBreakMode.WordWrap || Element.LineBreakMode == LineBreakMode.CharacterWrap) + result.Request = new Size(Math.Max(result.Minimum.Width, widthConstraint), result.Request.Height); } return result; -- 2.7.4