Browse Source

Merge pull request #8540 from AvaloniaUI/fix-dataGrid-typo

Fix typo in DataGrid
pull/8559/head
Max Katz 4 years ago
committed by GitHub
parent
commit
1eead138fc
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs
  2. 2
      src/Avalonia.Controls.DataGrid/DataGridColumn.cs

8
src/Avalonia.Controls.DataGrid/Collections/DataGridSortDescription.cs

@ -268,11 +268,11 @@ namespace Avalonia.Collections
public static DataGridSortDescription FromComparer(IComparer comparer, ListSortDirection direction = ListSortDirection.Ascending) public static DataGridSortDescription FromComparer(IComparer comparer, ListSortDirection direction = ListSortDirection.Ascending)
{ {
return new DataGridComparerSortDesctiption(comparer, direction); return new DataGridComparerSortDescription(comparer, direction);
} }
} }
public class DataGridComparerSortDesctiption : DataGridSortDescription public class DataGridComparerSortDescription : DataGridSortDescription
{ {
private readonly IComparer _innerComparer; private readonly IComparer _innerComparer;
private readonly ListSortDirection _direction; private readonly ListSortDirection _direction;
@ -281,7 +281,7 @@ namespace Avalonia.Collections
public IComparer SourceComparer => _innerComparer; public IComparer SourceComparer => _innerComparer;
public override IComparer<object> Comparer => _comparer; public override IComparer<object> Comparer => _comparer;
public override ListSortDirection Direction => _direction; public override ListSortDirection Direction => _direction;
public DataGridComparerSortDesctiption(IComparer comparer, ListSortDirection direction) public DataGridComparerSortDescription(IComparer comparer, ListSortDirection direction)
{ {
_innerComparer = comparer; _innerComparer = comparer;
_direction = direction; _direction = direction;
@ -300,7 +300,7 @@ namespace Avalonia.Collections
public override DataGridSortDescription SwitchSortDirection() public override DataGridSortDescription SwitchSortDirection()
{ {
var newDirection = _direction == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending; var newDirection = _direction == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending;
return new DataGridComparerSortDesctiption(_innerComparer, newDirection); return new DataGridComparerSortDescription(_innerComparer, newDirection);
} }
} }

2
src/Avalonia.Controls.DataGrid/DataGridColumn.cs

@ -1091,7 +1091,7 @@ namespace Avalonia.Controls
{ {
return return
OwningGrid.DataConnection.SortDescriptions OwningGrid.DataConnection.SortDescriptions
.OfType<DataGridComparerSortDesctiption>() .OfType<DataGridComparerSortDescription>()
.FirstOrDefault(s => s.SourceComparer == CustomSortComparer); .FirstOrDefault(s => s.SourceComparer == CustomSortComparer);
} }

Loading…
Cancel
Save