Merge pull request #4738 from CommunityToolkit/ListDetailsView.ListPa…

…neWidth-NRE-fix ListDetailsView.ListPaneWidth Null check fix
CommunityToolkit · Sep 2, 2022 · db12288 · db12288
2 parents bba01d7 + f3cb295
commit db12288
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
@@ -11,7 +11,8 @@
         <controls:ListDetailsView BackButtonBehavior="Automatic"
                                     ItemsSource="{Binding Emails}"
                                     NoSelectionContent="Select an item to view"
-                                    CompactModeThresholdWidth="720">
+                                    CompactModeThresholdWidth="720"
+                                    ListPaneWidth="400">
             <controls:ListDetailsView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Margin="0,8">

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/ListDetailsView/ListDetailsView.cs
@@ -461,7 +461,10 @@ protected override void OnItemsChanged(object e)
         /// </summary>
         private void OnListPaneWidthChanged()
         {
-            _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+            if (_twoPaneView != null)
+            {
+                _twoPaneView.Pane1Length = new GridLength(ListPaneWidth);
+            }
         }
     }
 }