Fix Issue #1256 (#1267)

Better fix Co-authored-by: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>
CommunityToolkit · Jul 3, 2023 · 0c17bc9 · 0c17bc9
1 parent 4ab1b51
commit 0c17bc9
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.macios.cs b/src/CommunityToolkit.Maui.Core/Views/Popup/PopupExtensions.macios.cs
@@ -23,15 +23,10 @@ public static void SetSize(this MauiPopup mauiPopup, in IPopup popup)
 		else if (popup.Content is not null)
 		{
 			var content = popup.Content;
-			if (!content.Width.IsZeroOrNaN() || !content.Height.IsZeroOrNaN())
-			{
-				mauiPopup.PreferredContentSize = new CGSize(content.Width, content.Height);
-			}
-			else
-			{
-				var measure = popup.Content.Measure(double.PositiveInfinity, double.PositiveInfinity);
-				mauiPopup.PreferredContentSize = new CGSize(measure.Width, measure.Height);
-			}
+			var measure = popup.Content.Measure(double.PositiveInfinity, double.PositiveInfinity);
+			var width = content.Width.IsZeroOrNaN() ? measure.Width : content.Width;
+			var height = content.Height.IsZeroOrNaN() ? measure.Height : content.Height;
+			mauiPopup.PreferredContentSize = new CGSize(width, height);
 		}
 	}