From df3266d1607ba43277e8999305880f179dd5b5ca Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Fri, 28 Feb 2025 14:52:20 +0100 Subject: [PATCH] chore: Adjust for mac catalyst --- .../ListViewBase/ListViewBaseSource.iOS.cs | 2 +- .../ListViewBase/NativeListViewBase.iOS.cs | 47 ------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs index 112a35e7124d..e86b731b01d6 100644 --- a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs +++ b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs @@ -498,13 +498,13 @@ public override void DidZoom(UIScrollView scrollView) // obvious what it would be in the case of a list). Owner.XamlParent?.ScrollViewer?.Presenter?.OnNativeZoom((float)Owner.ZoomScale); } -#endif private void OnAnimatedScrollEnded() { _isInAnimatedScroll = false; InvokeOnScroll(); } +#endif private void InvokeOnScroll() { diff --git a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.iOS.cs index 68d503db2533..5f548fc0fdba 100644 --- a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.iOS.cs +++ b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.iOS.cs @@ -604,53 +604,6 @@ void ScrollInner() } } - private UICollectionViewScrollPosition ConvertSnapPointsAlignmentToScrollPosition() - { - var snapPointsType = (CollectionViewLayout as VirtualizingPanelLayout)?.SnapPointsType; - - if (snapPointsType != SnapPointsType.MandatorySingle) - { - return UICollectionViewScrollPosition.None; - } - - var scrollDirection = ScrollOrientation; - var snapPointsAlignment = (CollectionViewLayout as VirtualizingPanelLayout)?.SnapPointsAlignment; - - switch (scrollDirection) - { - case Orientation.Horizontal: - { - switch (snapPointsAlignment) - { - case SnapPointsAlignment.Center: - return UICollectionViewScrollPosition.CenteredHorizontally; - case SnapPointsAlignment.Near: - return UICollectionViewScrollPosition.Left; - case SnapPointsAlignment.Far: - return UICollectionViewScrollPosition.Right; - } - - throw new InvalidOperationException(); - } - case Orientation.Vertical: - { - switch (snapPointsAlignment) - { - case SnapPointsAlignment.Center: - return UICollectionViewScrollPosition.CenteredVertically; - case SnapPointsAlignment.Near: - return UICollectionViewScrollPosition.Top; - case SnapPointsAlignment.Far: - return UICollectionViewScrollPosition.Bottom; - } - - throw new InvalidOperationException(); - } - } - - return UICollectionViewScrollPosition.None; - } - private UICollectionViewScrollPosition ConvertScrollAlignmentForGroups(ScrollIntoViewAlignment alignment) { if (alignment == ScrollIntoViewAlignment.Default && this.Log().IsEnabled(LogLevel.Warning))