feat(calendar): Implement virtualisation

unoplatform · Jun 1, 2021 · 430fe39 · 430fe39
1 parent b6d1dc6
commit 430fe39
Show file tree

Hide file tree

Showing 8 changed files with 519 additions and 137 deletions.
diff --git a/src/Uno.UI/DirectUI/DateComparer.cs b/src/Uno.UI/DirectUI/DateComparer.cs
@@ -103,7 +103,10 @@ private int CompareDate(
 
 			global::System.Diagnostics.Debug.Assert(m_spCalendar is {});
 
-			long delta = lhs.ToUniversalTime().Ticks - rhs.ToUniversalTime().Ticks;
+			lhs = lhs.ToUniversalTime(); // UNO
+			rhs = rhs.ToUniversalTime(); // UNO
+
+			long delta = lhs.Ticks - rhs.Ticks;
 			if (delta < 0)
 			{
 				delta = -delta;

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarLayoutStrategy.uno.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarLayoutStrategy.uno.cs
@@ -52,6 +52,24 @@ internal Rect GetElementBounds(
 			return rect;
 		}
 
+		internal Rect GetElementArrangeBounds(
+			ElementType elementType,
+			int elementIndex,
+			Rect containerBounds,
+			Rect windowConstraint,
+			Size finalSize)
+		{
+			GetElementArrangeBoundsImpl(
+				elementType,
+				elementIndex,
+				containerBounds,
+				windowConstraint,
+				finalSize,
+				out var pReturnValue);
+
+			return pReturnValue;
+		}
+
 		internal bool ShouldContinueFillingUpSpace(
 			ElementType elementType,
 			int elementIndex,

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarView.Properties.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarView.Properties.cs
@@ -777,19 +777,19 @@ private set
 		Windows.UI.Xaml.DependencyProperty.Register(
 			nameof(IsGroupLabelVisible), typeof(bool), 
 			typeof(global::Windows.UI.Xaml.Controls.CalendarView), 
-			new FrameworkPropertyMetadata(default(bool)));
+			new FrameworkPropertyMetadata(false));
 
 		public static global::Windows.UI.Xaml.DependencyProperty IsOutOfScopeEnabledProperty { get; } = 
 		Windows.UI.Xaml.DependencyProperty.Register(
 			nameof(IsOutOfScopeEnabled), typeof(bool), 
 			typeof(global::Windows.UI.Xaml.Controls.CalendarView), 
-			new FrameworkPropertyMetadata(default(bool)));
+			new FrameworkPropertyMetadata(true));
 
 		public static global::Windows.UI.Xaml.DependencyProperty IsTodayHighlightedProperty { get; } = 
 		Windows.UI.Xaml.DependencyProperty.Register(
 			nameof(IsTodayHighlighted), typeof(bool), 
 			typeof(global::Windows.UI.Xaml.Controls.CalendarView), 
-			new FrameworkPropertyMetadata(default(bool)));
+			new FrameworkPropertyMetadata(true));
 
 		public static global::Windows.UI.Xaml.DependencyProperty MaxDateProperty { get; } = 
 		Windows.UI.Xaml.DependencyProperty.Register(

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/CalendarView/CalendarViewGeneratorHost.cs
@@ -160,7 +160,7 @@ internal virtual void PrepareItemContainer(
 			return;
 		}
 
-		private void ClearContainerForItem(
+		internal void ClearContainerForItem(
 			DependencyObject pContainer,
 			object pItem)
 		{
@@ -212,7 +212,7 @@ private void ClearGroupContainerForGroup(
 			throw new NotImplementedException();
 		}
 
-		private bool CanRecycleContainer(
+		internal bool CanRecycleContainer(
 			DependencyObject pContainer)
 		{
 			var pCanRecycleContainer = true;
@@ -602,7 +602,7 @@ internal void UpdateScope(
 		internal void AdjustToFirstUnitInThisScope(out DateTime pDate)
 		{
 			int _ = 0;
-			AdjustToLastUnitInThisScope(out pDate, ref _);
+			AdjustToFirstUnitInThisScope(out pDate, ref _);
 		}
 
 		private void AdjustToFirstUnitInThisScope(out DateTime pDate, ref int pUnit /* = null */)
@@ -649,7 +649,7 @@ private void AdjustToLastUnitInThisScope(out DateTime pDate, ref int pUnit /* =
 
 			//if (pUnit)
 			//{
-			//	pUnit = lastUnit;
+				pUnit = lastUnit;
 			//}
 		}