test(scrollviewer): Added a sample to illustrate nested scrollviewer …

…problem on Android
unoplatform · Jun 1, 2021 · d4e2213 · d4e2213
1 parent 2f2c505
commit d4e2213
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 0 deletions.
diff --git a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
@@ -1545,6 +1545,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Nested.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Padding.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -5193,6 +5197,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Margin.xaml.cs">
       <DependentUpon>ScrollViewer_Margin.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Nested.xaml.cs">
+      <DependentUpon>ScrollViewer_Nested.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Windows_UI_Xaml_Controls\ScrollViewerTests\ScrollViewer_Padding.xaml.cs">
       <DependentUpon>ScrollViewer_Padding.xaml</DependentUpon>
     </Compile>

diff --git a/...lesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml b/...lesApp/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml
@@ -0,0 +1,22 @@
+<Page
+    x:Class="UITests.Windows_UI_Xaml_Controls.ScrollViewerTests.ScrollViewer_Nested"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<ScrollViewer Width="400" Height="400" Background="Yellow">
+		<StackPanel Padding="20" Spacing="10">
+			<Border Background="Blue" Height="200" />
+			<ScrollViewer Height="200" Background="Red">
+				<StackPanel Padding="20" Spacing="10">
+					<Border Background="Green" Height="150" />
+					<Border Background="Green" Height="150" />
+				</StackPanel>
+			</ScrollViewer>
+			<Border Background="Blue" Height="200" />
+		</StackPanel>
+	</ScrollViewer>
+</Page>
diff --git a/...App/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml.cs b/...App/UITests.Shared/Windows_UI_Xaml_Controls/ScrollViewerTests/ScrollViewer_Nested.xaml.cs
@@ -0,0 +1,14 @@
+using Windows.UI.Xaml.Controls;
+using Uno.UI.Samples.Controls;
+
+namespace UITests.Windows_UI_Xaml_Controls.ScrollViewerTests
+{
+	[Sample("ScrollViewer")]
+	public sealed partial class ScrollViewer_Nested : Page
+	{
+		public ScrollViewer_Nested()
+		{
+			this.InitializeComponent();
+		}
+	}
+}