fix(calendar): Fix setting Width and Height on Calendar does nothing

jeromelaban · Jun 15, 2021 · 2be72c9 · 2be72c9
1 parent b64a6cb
commit 2be72c9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...no.UI/UI/Xaml/Controls/CalendarView/Primitives/CalendarPanel.ModernCollectionBasePanel.cs b/...no.UI/UI/Xaml/Controls/CalendarView/Primitives/CalendarPanel.ModernCollectionBasePanel.cs
@@ -517,11 +517,11 @@ private Rect GetLayoutViewport(Size availableSize = default)
 			var viewport = new Rect(
 				_effectiveViewport.Location.FiniteOrDefault(default),
 				_effectiveViewport.Size.AtLeast(availableSize).AtLeast(_defaultHardCodedSize).FiniteOrDefault(_defaultHardCodedSize));
-			if (calendar.HorizontalAlignment != HorizontalAlignment.Stretch)
+			if (calendar.HorizontalAlignment != HorizontalAlignment.Stretch && double.IsNaN(calendar.Width) && calendar.MinWidth <= 0)
 			{
 				viewport.Width = _defaultHardCodedSize.Width;
 			}
-			if (calendar.VerticalAlignment != VerticalAlignment.Stretch)
+			if (calendar.VerticalAlignment != VerticalAlignment.Stretch && double.IsNaN(calendar.Height) && calendar.MinHeight <= 0)
 			{
 				viewport.Height = _defaultHardCodedSize.Height;
 			}