summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamantha Houts <samantha.houts@xamarin.com>2016-03-23 15:31:38 -0700
committerSamantha Houts <samantha.houts@xamarin.com>2016-03-23 15:32:21 -0700
commitd5c3359070317e57a2cb8e98608d0286071e389d (patch)
treea363f563a452b7980587d798f1786cd6837f5fcf
parent2cb7e5363daba65ff73ee5edea4ce311af24269c (diff)
downloadxamarin-forms-d5c3359070317e57a2cb8e98608d0286071e389d.tar.gz
xamarin-forms-d5c3359070317e57a2cb8e98608d0286071e389d.tar.bz2
xamarin-forms-d5c3359070317e57a2cb8e98608d0286071e389d.zip
[W] ListView Cells will respect RowHeight
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs39
-rw-r--r--Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems1
-rw-r--r--Xamarin.Forms.Platform.UAP/Resources.xaml2
-rw-r--r--Xamarin.Forms.Platform.WinRT/Resources.xaml2
4 files changed, 42 insertions, 2 deletions
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
index 00000000..0f5ac9dd
--- /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 c13429db..81a6c2e2 100644
--- 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 e26eb392..bca87974 100644
--- 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 fe135a89..c1edeeaf 100644
--- 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">