[iOS] Label should not return infinite width
authorSamantha Houts <samantha.houts@xamarin.com>
Sat, 18 Feb 2017 00:41:35 +0000 (16:41 -0800)
committerRui Marinho <me@ruimarinho.net>
Fri, 10 Mar 2017 14:44:41 +0000 (14:44 +0000)
Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs

index 58312f8..3509bee 100644 (file)
@@ -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;