Skip to content

Add _isReleasingDataSource to prevent unnecessary operations on CurrentCell when changing or releasing DataSource #13320

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

Merged
Tanya-Solyanik merged 3 commits into from
Apr 21, 2025
Merged

Add _isReleasingDataSource to prevent unnecessary operations on CurrentCell when changing or releasing DataSource #13320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecf5b7f
Add _isReleasingDataSource to prevent unnecessary operations on Curre…
LeafShi1 Apr 17, 2025
0d1418f
Add a new flag _dataGridViewOper[OperationInReleasingDataSource] inst…
LeafShi1 Apr 21, 2025
59cbb81
Removing field _isReleasingDataSource
LeafShi1 Apr 21, 2025
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
3 changes: 2 additions & 1 deletion src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27017,7 +27017,8 @@ protected virtual bool SetCurrentCellAddressCore(int columnIndex,
int oldCurrentCellY = _ptCurrentCell.Y;
if (oldCurrentCellX >= 0
&& !_dataGridViewState1[State1_TemporarilyResetCurrentCell]
&& !_dataGridViewOper[OperationInDispose])
&& !_dataGridViewOper[OperationInDispose]
&& !_dataGridViewOper[OperationInReleasingDataSource])
{
DataGridViewCell currentCell = CurrentCellInternal;
if (!EndEdit(
Expand Down
13 changes: 12 additions & 1 deletion src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public partial class DataGridView : Control, ISupportInitialize
private const int OperationInEndEdit = 0x00400000;
private const int OperationResizingOperationAboutToStart = 0x00800000;
private const int OperationTrackKeyboardColResize = 0x01000000;
private const int OperationInReleasingDataSource = 0x02000000;
private const int OperationMouseOperationMask = OperationTrackColResize | OperationTrackRowResize |
OperationTrackColRelocation | OperationTrackColHeadersResize | OperationTrackRowHeadersResize;
private const int OperationKeyboardOperationMask = OperationTrackKeyboardColResize;
Expand Down Expand Up @@ -1921,7 +1922,17 @@ public object? DataSource
newDataSource.Disposed += OnDataSourceDisposed;
}

CurrentCell = null;
_dataGridViewOper[OperationInReleasingDataSource] = true;
Copy link
Contributor

@Tanya-Solyanik Tanya-Solyanik Apr 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we actually set this value inside the OnDataSourceDisposed instead of on any invocation of DataSource setter property? The new flag skips code that commits the value being editted, we want to skip the commit only if the control is diaposed and editing had not been completed.

Copy link
Member Author

@LeafShi1 LeafShi1 Apr 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this makes more sense. CurrentCell = null; should also be placed in OnDataSourceDisposed, what do you think?

I submitted a new PR #13362

Copy link
Contributor

@Tanya-Solyanik Tanya-Solyanik Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CurrentCell = null; should stay because it manages event handlers and that logic is needed when DataSource is changed for reasons other that disposal.


try
{
CurrentCell = null;
}
finally
{
_dataGridViewOper[OperationInReleasingDataSource] = false;
}

if (DataConnection is null)
{
DataConnection = new DataGridViewDataConnection(this);
Expand Down