From: Samantha Houts <samantha.houts@xamarin.com>
Date: Sat, 18 Feb 2017 00:41:35 +0000 (-0800)
Subject: [iOS] Label should not return infinite width
X-Git-Tag: beta-2.3.4-pre4~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d455bc42eaf79edb2dc0bb3b5a194fc91a98f96d;p=platform%2Fupstream%2Fxamarin-forms.git

[iOS] Label should not return infinite width
---

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
index 58312f8..3509bee 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
@@ -28,8 +28,9 @@ namespace Xamarin.Forms.Platform.iOS
 			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;