feat(itemsrepeater): [iOS] Enable clipping on the ScrollViewer

unoplatform · Nov 16, 2020 · 6a05d31 · 6a05d31
1 parent e98a417
commit 6a05d31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs
@@ -34,6 +34,7 @@ public partial class ScrollContentPresenter : ContentPresenter, ILayoutConstrain
 		private void InitializeScrollContentPresenter()
 		{
 			this.RegisterParentChangedCallback(this, OnParentChanged);
+			IFrameworkElementHelper.Initialize(this);
 		}
 
 		private void OnParentChanged(object instance, object key, DependencyObjectParentChangedEventArgs args)

diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.iOS.cs
@@ -18,7 +18,7 @@
 
 namespace Windows.UI.Xaml.Controls
 {
-	public partial class ScrollViewer : ContentControl
+	public partial class ScrollViewer : ContentControl, ICustomClippingElement
 	{
 		/// <summary>
 		/// On iOS 10-, we set a flag on the view controller such that the CommandBar doesn't automatically affect ScrollViewer content 
@@ -160,5 +160,8 @@ public override void WillMoveToSuperview(UIView newsuper)
 			base.WillMoveToSuperview(newsuper);
 			UpdateSizeChangedSubscription(isCleanupRequired: newsuper == null);
 		}
+
+		bool ICustomClippingElement.AllowClippingToLayoutSlot => true;
+		bool ICustomClippingElement.ForceClippingToLayoutSlot => true; // force scrollviewer to always clip
 	}
 }