[W] ListView Cells will respect RowHeight

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs
new file mode 100644 (file)
index 0000000..0f5ac9d
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs
@@ -0,0 +1,39 @@
+using System;
+
+using Xamarin.Forms.CustomAttributes;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+#endif
+
+namespace Xamarin.Forms.Controls
+{
+       [Preserve(AllMembers = true)]
+       [Issue(IssueTracker.Bugzilla, 39829, "RowHeight of ListView is not working for UWP", PlatformAffected.WinRT)]
+       public class Bugzilla39829 : TestContentPage
+       {
+               protected override void Init()
+               {
+                       Title = "Master";
+                       var listView = new ListView
+                       {
+                               RowHeight = 150,
+                               AutomationId = "listview",
+                               ItemsSource = new string[] { "Test1", "Test2", "Test3", "Test4", "Test5", "Test6", }
+                       };
+
+                       Content = listView;
+               }
+
+#if UITEST
+               [Test]
+               [Category("ManualReview")]
+               public void Bugzilla39829Test()
+               {
+                       RunningApp.WaitForElement(q => q.Marked("listview"));
+                       RunningApp.Screenshot("If there isn't substantial space between the list items, this test has failed.");
+               }
+#endif
+       }
+}

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index c13429d..81a6c2e 100644 (file)
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -125,6 +125,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla38112.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39499.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39668.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla39829.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)_Template.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1028.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue1075.cs" />

diff --git a/Xamarin.Forms.Platform.UAP/Resources.xaml b/Xamarin.Forms.Platform.UAP/Resources.xaml
index e26eb39..bca8797 100644 (file)
--- a/Xamarin.Forms.Platform.UAP/Resources.xaml
+++ b/Xamarin.Forms.Platform.UAP/Resources.xaml
@@ -175,7 +175,7 @@
        </Style>
 
     <DataTemplate x:Key="CellTemplate">
-        <uwp:CellControl HorizontalContentAlignment="Stretch" />
+               <uwp:CellControl HorizontalContentAlignment="Stretch" Height="{Binding Cell.RenderHeight,RelativeSource={RelativeSource Mode=Self},Converter={StaticResource HeightConverter}}" />
        </DataTemplate>
 
        <DataTemplate x:Key="TableRoot">

diff --git a/Xamarin.Forms.Platform.WinRT/Resources.xaml b/Xamarin.Forms.Platform.WinRT/Resources.xaml
index fe135a8..c1edeea 100644 (file)
--- a/Xamarin.Forms.Platform.WinRT/Resources.xaml
+++ b/Xamarin.Forms.Platform.WinRT/Resources.xaml
@@ -44,7 +44,7 @@
     </DataTemplate>
 
     <DataTemplate x:Key="CellTemplate">
-               <forms:CellControl HorizontalContentAlignment="Stretch" />
+               <forms:CellControl HorizontalContentAlignment="Stretch" Height="{Binding Cell.RenderHeight,RelativeSource={RelativeSource Mode=Self},Converter={StaticResource HeightConverter}}" />
        </DataTemplate>
 
        <DataTemplate x:Key="TableRoot">