From f47f71c08da60c2294eb5467f42b47d6ac6563a8 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Fri, 14 Oct 2022 03:41:06 -0400
Subject: [PATCH] Remove AlternatingRowBackground from the API

---
 .../ControlCatalog/Pages/DataGridPage.xaml    |  3 +--
 src/Avalonia.Controls.DataGrid/DataGrid.cs    | 25 +++----------------
 .../Themes/Fluent.xaml                        |  7 +-----
 .../Themes/Simple.xaml                        |  5 ----
 4 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/samples/ControlCatalog/Pages/DataGridPage.xaml b/samples/ControlCatalog/Pages/DataGridPage.xaml
index 27272a9ff7..bc8252a3a4 100644
--- a/samples/ControlCatalog/Pages/DataGridPage.xaml
+++ b/samples/ControlCatalog/Pages/DataGridPage.xaml
@@ -45,8 +45,7 @@
           <CheckBox x:Name="ShowGDP"  IsChecked="True"  Content="Toggle GDP Column Visibility"
                     DockPanel.Dock="Top"/>
           <DataGrid Name="dataGrid1" Margin="12" CanUserResizeColumns="True" CanUserReorderColumns="True" CanUserSortColumns="True" HeadersVisibility="All"
-                    RowBackground="#1000"
-                    AlternatingRowBackground="#1fff">
+                    RowBackground="#1000">
             <DataGrid.Columns>
               <!-- Using HeaderTemplate -->
               <DataGridTextColumn Header="Country" HeaderTemplate="{StaticResource Demo.DataTemplates.CountryHeader}" Binding="{Binding Name}" Width="6*" />
diff --git a/src/Avalonia.Controls.DataGrid/DataGrid.cs b/src/Avalonia.Controls.DataGrid/DataGrid.cs
index c6cc9bf278..c23bca1810 100644
--- a/src/Avalonia.Controls.DataGrid/DataGrid.cs
+++ b/src/Avalonia.Controls.DataGrid/DataGrid.cs
@@ -246,23 +246,6 @@ namespace Avalonia.Controls
             set { SetValue(ColumnWidthProperty, value); }
         }
 
-        public static readonly StyledProperty<IBrush> AlternatingRowBackgroundProperty =
-            AvaloniaProperty.Register<DataGrid, IBrush>(nameof(AlternatingRowBackground));
-
-        /// <summary>
-        /// Gets or sets the <see cref="T:System.Windows.Media.Brush" /> that is used to paint the background of odd-numbered rows.
-        /// </summary>
-        /// <returns>
-        /// The brush that is used to paint the background of odd-numbered rows. The default is a
-        /// <see cref="T:System.Windows.Media.SolidColorBrush" /> with a
-        /// <see cref="P:System.Windows.Media.SolidColorBrush.Color" /> value of white (ARGB value #00FFFFFF).
-        /// </returns>
-        public IBrush AlternatingRowBackground
-        {
-            get { return GetValue(AlternatingRowBackgroundProperty); }
-            set { SetValue(AlternatingRowBackgroundProperty, value); }
-        }
-
         public static readonly StyledProperty<int> FrozenColumnCountProperty =
             AvaloniaProperty.Register<DataGrid, int>(
                 nameof(FrozenColumnCount),
@@ -2058,7 +2041,7 @@ namespace Avalonia.Controls
                     forceHorizontalScroll: true);
             }
         }
-        
+
         protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
         {
             base.OnAttachedToVisualTree(e);
@@ -2167,7 +2150,7 @@ namespace Avalonia.Controls
 
             return desiredSize;
         }
-        
+
         /// <inheritdoc/>
         protected override void OnDataContextBeginUpdate()
         {
@@ -2183,7 +2166,7 @@ namespace Avalonia.Controls
 
             NotifyDataContextPropertyForAllRowCells(GetAllRows(), false);
         }
-        
+
         /// <summary>
         /// Raises the BeginningEdit event.
         /// </summary>
@@ -4575,7 +4558,7 @@ namespace Avalonia.Controls
                 dataGridCell.Content = element;
             }
 
-            
+
         }
 
         private void PreparingCellForEditPrivate(Control editingElement)
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
index b4bae02b9b..3019e3d158 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Fluent.xaml
@@ -232,7 +232,7 @@
         <Setter Property="Data" Value="{StaticResource DataGridSortIconDescendingPath}" />
       </Style>
     </ControlTheme>
-    
+
     <ControlTheme x:Key="DataGridTopLeftColumnHeader" TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
       <Setter Property="Template">
         <ControlTemplate>
@@ -337,10 +337,6 @@
         </ControlTemplate>
       </Setter>
 
-      <Style Selector="^:nth-child(even)">
-        <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
-      </Style>
-
       <Style Selector="^:invalid">
         <Style Selector="^ /template/ Rectangle#InvalidVisualElement">
           <Setter Property="Opacity" Value="0.4" />
@@ -484,7 +480,6 @@
 
     <ControlTheme x:Key="{x:Type DataGrid}" TargetType="DataGrid">
       <Setter Property="RowBackground" Value="Transparent" />
-      <Setter Property="AlternatingRowBackground" Value="Transparent" />
       <Setter Property="HeadersVisibility" Value="Column" />
       <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />
       <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
diff --git a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
index b43addff86..5fc6c8f17a 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
@@ -199,10 +199,6 @@
         </ControlTemplate>
       </Setter>
 
-      <Style Selector="^:nth-child(even)">
-        <Setter Property="Background" Value="{Binding $parent[DataGrid].AlternatingRowBackground}" />
-      </Style>
-
       <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
         <Setter Property="IsVisible" Value="False" />
         <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
@@ -299,7 +295,6 @@
     <ControlTheme x:Key="{x:Type DataGrid}"
                   TargetType="DataGrid">
       <Setter Property="RowBackground" Value="{DynamicResource ThemeAccentBrush4}" />
-      <Setter Property="AlternatingRowBackground" Value="#00FFFFFF" />
       <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}" />
       <Setter Property="HeadersVisibility" Value="Column" />
       <Setter Property="HorizontalScrollBarVisibility" Value="Auto" />