Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DataGrid selection refactoring #13848

Merged
merged 1 commit into from
Dec 7, 2023
Merged

DataGrid selection refactoring #13848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/Avalonia.Controls.DataGrid/DataGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1828,12 +1828,6 @@ internal int SlotCount
private set;
}

internal bool UpdatedStateOnMouseLeftButtonDown
{
get;
set;
}

/// <summary>
/// Indicates whether or not to use star-sizing logic. If the DataGrid has infinite available space,
/// then star sizing doesn't make sense. In this case, all star columns grow to a predefined size of
Expand Down
2 changes: 0 additions & 2 deletions src/Avalonia.Controls.DataGrid/DataGridCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ private void DataGridCell_PointerPressed(PointerPressedEventArgs e)
{
e.Handled = handled;
}

OwningGrid.UpdatedStateOnMouseLeftButtonDown = true;
}
}
else if (e.GetCurrentPoint(this).Properties.IsRightButtonPressed)
Expand Down
8 changes: 0 additions & 8 deletions src/Avalonia.Controls.DataGrid/DataGridRow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,14 +771,6 @@ private void DataGridRow_PointerPressed(PointerPressedEventArgs e)
if (OwningGrid != null)
{
OwningGrid.IsDoubleClickRecordsClickOnCall(this);
if (OwningGrid.UpdatedStateOnMouseLeftButtonDown)
{
OwningGrid.UpdatedStateOnMouseLeftButtonDown = false;
}
else
{
e.Handled = OwningGrid.UpdateStateOnMouseLeftButtonDown(e, -1, Slot, false);
}
}
}

Expand Down
1 change: 0 additions & 1 deletion src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ private void DataGridRowHeader_PointerPressed(object sender, PointerPressedEvent
Debug.Assert(sender is DataGridRowHeader);
Debug.Assert(sender == this);
e.Handled = OwningGrid.UpdateStateOnMouseLeftButtonDown(e, -1, Slot, false);
OwningGrid.UpdatedStateOnMouseLeftButtonDown = true;
}
}
else if (e.GetCurrentPoint(this).Properties.IsRightButtonPressed)
Expand Down