Bug 51536, initial iOS cell layout is incorrect when cell has context actions … ...
authorVitaly Knyazev <VitalyKnyazev@users.noreply.github.com>
Tue, 14 Mar 2017 16:22:21 +0000 (16:22 +0000)
committerRui Marinho <me@ruimarinho.net>
Tue, 14 Mar 2017 18:25:12 +0000 (18:25 +0000)
* Bug 51536, initial height is incorrect when cell has context actions or ListView is in recycle mode

* Improved fix for iOS uneven height cell layout

* Fixed indentation and added test case for issue 44525

* Fixed indentation for test case

* Added 1px room, this will fix Bugzilla31330 test, renamed test case to 51536

* Updated shared project file

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs [new file with mode: 0644]
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Xamarin.Forms.Platform.iOS/ContextActionCell.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs
new file mode 100644 (file)
index 0000000..0514912
--- /dev/null
@@ -0,0 +1,81 @@
+using System.Linq;
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+namespace Xamarin.Forms.Controls.Issues
+{
+       [Preserve(AllMembers = true)]
+       [Issue(IssueTracker.Bugzilla, 51536, "[iOS] Xamarin.Forms ListView Row Height Does Not Adapt")]
+       public class Bugzilla51536 : TestContentPage
+       {
+               protected override void Init()
+               {
+                       const string InstructionsLong = "On iOS, all the list items below will have different height defined by this text, the text " +
+                                                                               "should be wrapped and take all cell space. If this text is not wrapped and there is a lot of " +
+                                                                               "whitespace in the cell then this test has failed. This error was happening to ListView with RecycleElement mode " +
+                                                                               "or when cell has context actions.";
+
+                       const string InstructionsShort = "On iOS, all the list items below will have different height defined by this text.";
+
+                       var listItems = Enumerable.Range(1, 100).Select(i => new ItemViewModel
+                                                                                                                                {
+                                                                                                                                        Name = "Item" + i,
+                                                                                                                                        Description = i % 2 == 0 ? (InstructionsLong + i) : (InstructionsShort + i)
+                                                                                                                                }).ToArray();
+
+                       var listView = new ListView(ListViewCachingStrategy.RecycleElement)
+                       {
+                               ItemTemplate = new DataTemplate(typeof(ItemViewCell)),
+                               HasUnevenRows = true,
+                               ItemsSource = listItems
+                       };
+
+                       Content = listView;
+               }
+       }
+
+       [Preserve(AllMembers = true)]
+       public sealed class ItemViewModel
+       {
+               public string Name { get; set; }
+               public string Description { get; set; }
+       }
+
+       [Preserve(AllMembers = true)]
+       public sealed class ItemViewCell : ViewCell
+       {
+               public Label Label1 { get; set; }
+               public Label Label2 { get; set; }
+
+               public ItemViewCell()
+               {
+                       var stackLayout = new StackLayout
+                       {
+                               Orientation = StackOrientation.Vertical,
+                               HorizontalOptions = LayoutOptions.StartAndExpand,
+                               VerticalOptions = LayoutOptions.StartAndExpand
+                       };
+
+                       Label1 = new Label();
+                       Label2 = new Label { LineBreakMode = LineBreakMode.WordWrap };
+
+                       stackLayout.Children.Add(Label1);
+                       stackLayout.Children.Add(Label2);
+
+                       View = stackLayout;
+               }
+
+               protected override void OnBindingContextChanged()
+               {
+                       base.OnBindingContextChanged();
+
+                       var item = BindingContext as ItemViewModel;
+
+                       if (item != null)
+                       {
+                               Label1.Text = item.Name;
+                               Label2.Text = item.Description;
+                       }
+               }
+       }
+}
\ No newline at end of file
index 77b8f4e..b2f7949 100644 (file)
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla43663.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla43735.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44453.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla51536.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44940.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44944.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44166.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bugzilla44461.cs" />
index 2e5925c..cac9e9e 100644 (file)
@@ -87,7 +87,8 @@ namespace Xamarin.Forms.Platform.iOS
                {
                        base.LayoutSubviews();
 
-                       if (_scroller == null || (_scroller != null && _scroller.Frame.Width == ContentView.Bounds.Width))
+                       // Leave room for 1px of play because the border is 1 or .5px and must be accounted for.
+                       if (_scroller == null || (_scroller.Frame.Width == ContentView.Bounds.Width && Math.Abs(_scroller.Frame.Height - ContentView.Bounds.Height) < 1))
                                return;
 
                        Update(_tableView, _cell, ContentCell);