Skip to content

Removing flag OperationInReleasingDataSource from DataGridView.cs #13362

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
merged 4 commits into from
Apr 25, 2025
Merged

Removing flag OperationInReleasingDataSource from DataGridView.cs #13362

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cd1ddb
Moving tag OperationInReleasingDataSource to function "OnDataSourceDi…
LeafShi1 Apr 24, 2025
f0546b8
Add comment for the content of the function OnDataSourceDisposed
LeafShi1 Apr 24, 2025
31d5a9b
Add IsHandleCreated before invoking EndEdit
LeafShi1 Apr 24, 2025
f20795a
Move the judgment of IsHandleCreated to before defining currentCell
LeafShi1 Apr 24, 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
5 changes: 2 additions & 3 deletions 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,11 +27017,10 @@ protected virtual bool SetCurrentCellAddressCore(int columnIndex,
int oldCurrentCellY = _ptCurrentCell.Y;
if (oldCurrentCellX >= 0
&& !_dataGridViewState1[State1_TemporarilyResetCurrentCell]
&& !_dataGridViewOper[OperationInDispose]
&& !_dataGridViewOper[OperationInReleasingDataSource])
&& !_dataGridViewOper[OperationInDispose])
{
DataGridViewCell currentCell = CurrentCellInternal;
if (!EndEdit(
if (IsHandleCreated && !EndEdit(
DataGridViewDataErrorContexts.Parsing | DataGridViewDataErrorContexts.Commit | DataGridViewDataErrorContexts.CurrentCellChange,
validateCurrentCell ? DataGridViewValidateCellInternal.Always : DataGridViewValidateCellInternal.Never,
fireCellLeave: validateCurrentCell,
Expand Down
12 changes: 1 addition & 11 deletions 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,7 +222,6 @@ 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 @@ -1922,16 +1921,7 @@ public object? DataSource
newDataSource.Disposed += OnDataSourceDisposed;
}

_dataGridViewOper[OperationInReleasingDataSource] = true;

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

if (DataConnection is null)
{
Expand Down