fix(FlipView): Flipping on WASM and Skia

unoplatform · Apr 5, 2022 · 811266b · 811266b
1 parent 9942b0c
commit 811266b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
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,10 +75,20 @@ private static double GetHorizontalScrollWheelDelta(Size size, double delta)
 		const double ScrollViewerMinHeightToReflowAroundOcclusions = 32.0f;
 
 		private /*readonly - partial*/ IScrollStrategy _strategy;
-
-		public bool CanHorizontallyScroll { get; set; }
 
-		public bool CanVerticallyScroll { get; set; }
+		private bool _canHorizontallyScroll;
+		public bool CanHorizontallyScroll
+		{
+			get => _canHorizontallyScroll || _forceChangeToCurrentView;
+			set => _canHorizontallyScroll = value;
+		}
+
+		private bool _canVerticallyScroll;
+		public bool CanVerticallyScroll
+		{
+			get => _canVerticallyScroll || _forceChangeToCurrentView;
+			set => _canVerticallyScroll = value;
+		}
 
 		public double HorizontalOffset { get; private set; }
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollContentPresenter/ScrollContentPresenter.cs
@@ -60,14 +60,21 @@ public object ScrollOwner
 
 		private ScrollViewer Scroller => ScrollOwner as ScrollViewer;
 
-#if __WASM__
 		bool _forceChangeToCurrentView;
 
+#if __WASM__
 		bool IScrollContentPresenter.ForceChangeToCurrentView
 		{
 			get => _forceChangeToCurrentView;
 			set => _forceChangeToCurrentView = value;
 		}
+
+#elif __SKIA__
+		internal bool ForceChangeToCurrentView
+		{
+			get => _forceChangeToCurrentView;
+			set => _forceChangeToCurrentView = value;
+		}
 #endif
 
 		private void InitializeScrollContentPresenter()

diff --git a/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs b/src/Uno.UI/UI/Xaml/Controls/ScrollViewer/ScrollViewer.cs
@@ -942,7 +942,7 @@ protected override void OnApplyTemplate()
 
 			_isTemplateApplied = _presenter != null;
 
-#if __WASM__
+#if __WASM__ || __SKIA__
 			if (_presenter != null && ForceChangeToCurrentView)
 			{
 				_presenter.ForceChangeToCurrentView = ForceChangeToCurrentView;