diff options
author | Samantha Houts <samantha.houts@xamarin.com> | 2017-02-17 16:41:35 -0800 |
---|---|---|
committer | Rui Marinho <me@ruimarinho.net> | 2017-02-21 10:17:18 +0000 |
commit | 8c457a0e14f2b9c0df50092ca2fb3b8feebd7bfc (patch) | |
tree | 8d22ad819b9078ec34dce5d79bd291b3211f1127 | |
parent | 839bab8d98fc94fcf3f79e45da50ce302ce173b5 (diff) | |
download | xamarin-forms-8c457a0e14f2b9c0df50092ca2fb3b8feebd7bfc.tar.gz xamarin-forms-8c457a0e14f2b9c0df50092ca2fb3b8feebd7bfc.tar.bz2 xamarin-forms-8c457a0e14f2b9c0df50092ca2fb3b8feebd7bfc.zip |
[iOS] Label should not return infinite width
-rw-r--r-- | Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs index 4cf3be92..b8b81e99 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; |