feat(scrollviewer): Implement the SCP.ScrollOwner (avoids anoying log…

…s on wasm, android and ios)
unoplatform · Jun 1, 2021 · ab3ccb6 · ab3ccb6
1 parent aa570e4
commit ab3ccb6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/ScrollContentPresenter.cs b/src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/ScrollContentPresenter.cs
@@ -7,7 +7,7 @@ namespace Windows.UI.Xaml.Controls
 	#endif
 	public  partial class ScrollContentPresenter 
 	{
-		#if __ANDROID__ || __IOS__ || NET461 || __WASM__ || false || __NETSTD_REFERENCE__ || false
+		#if false
 		[global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")]
 		public  object ScrollOwner
 		{

diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.Managed.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.Managed.cs
@@ -75,21 +75,7 @@ private static double GetHorizontalScrollWheelDelta(Size size, double delta)
 		const double ScrollViewerMinHeightToReflowAroundOcclusions = 32.0f;
 
 		private readonly IScrollStrategy _strategy;
-		private ManagedWeakReference _scroller;
-
-		public object ScrollOwner
-		{
-			get => _scroller.Target;
-			set
-			{
-				if (_scroller is { } oldScroller)
-				{
-					WeakReferencePool.ReturnWeakReference(this, oldScroller);
-				}
-
-				_scroller = WeakReferencePool.RentWeakReference(this, value);
-			}
-		}
+
 		private ScrollViewer Scroller => ScrollOwner as ScrollViewer;
 
 		public bool CanHorizontallyScroll { get; set; }

diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs
@@ -30,6 +30,24 @@ namespace Windows.UI.Xaml.Controls
 {
 	public partial class ScrollContentPresenter : ContentPresenter, ILayoutConstraints
 	{
+		#region ScrollOwner
+		private ManagedWeakReference _scroller;
+
+		public object ScrollOwner
+		{
+			get => _scroller.Target;
+			set
+			{
+				if (_scroller is { } oldScroller)
+				{
+					WeakReferencePool.ReturnWeakReference(this, oldScroller);
+				}
+
+				_scroller = WeakReferencePool.RentWeakReference(this, value);
+			}
+		}
+		#endregion
+
 		private void InitializeScrollContentPresenter()
 		{
 			this.RegisterParentChangedCallback(this, OnParentChanged);