set styles to default when set to null

akgulebubekir · Nov 13, 2024 · 1b048ba · 1b048ba
1 parent 07ef524
commit 1b048ba
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
@@ -647,7 +647,14 @@ public partial class DataGrid
                 {
                     foreach (var column in self.Columns)
                     {
-                        column.SortingIcon.Style = n;
+                        if (n is null)
+                        {
+                            column.SortingIcon.Style = self.DefaultSortIconStyle;
+                        }
+                        else
+                        {
+                            column.SortingIcon.Style = n;
+                        }
                     }
                 }
             });

diff --git a/Maui.DataGrid/DataGridColumn.cs b/Maui.DataGrid/DataGridColumn.cs
@@ -167,7 +167,17 @@ public sealed class DataGridColumn : BindableObject, IDefinition
             {
                 if (b is DataGridColumn self && self.HeaderLabel != null)
                 {
-                    self.HeaderLabel.Style = n;
+                    if (n is null)
+                    {
+                        if (self.DataGrid is not null)
+                        {
+                            self.HeaderLabel.Style = self.DataGrid.DefaultHeaderLabelStyle;
+                        }
+                    }
+                    else
+                    {
+                        self.HeaderLabel.Style = n;
+                    }
                 }
             });
 
@@ -180,7 +190,17 @@ public sealed class DataGridColumn : BindableObject, IDefinition
             {
                 if (b is DataGridColumn self)
                 {
-                    self.FilterTextbox.Style = n;
+                    if (n is null)
+                    {
+                        if (self.DataGrid is not null)
+                        {
+                            self.FilterTextbox.Style = self.DataGrid.DefaultHeaderFilterStyle;
+                        }
+                    }
+                    else
+                    {
+                        self.FilterTextbox.Style = n;
+                    }
                 }
             });