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

Fixes Exception being thrown when the space key is pressed on a CheckBoxCell #12821

Merged
merged 2 commits into from
Feb 12, 2025
Merged

Fixes Exception being thrown when the space key is pressed on a CheckBoxCell #12821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e74b89
Prevents runtime crashes when the `DataGridView` or `CurrentCell` are…
Jan 28, 2025
a4629b7
Handle feedbacks
Jan 28, 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
4 changes: 3 additions & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3671,7 +3671,9 @@ internal void PaintWork(Graphics graphics,
cellStyle,
advancedBorderStyle,
paintParts);
dataGridView.OnCellPainting(dgvcpe);

dataGridView?.OnCellPainting(dgvcpe);

if (dgvcpe.Handled)
{
return;
Expand Down
14 changes: 11 additions & 3 deletions ....Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewCheckBoxCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,9 +967,12 @@ private void NotifyUiaClient()

private void NotifyMSAAClient(int columnIndex, int rowIndex)
{
Debug.Assert(DataGridView is not null);
Debug.Assert((columnIndex >= 0) && (columnIndex < DataGridView.Columns.Count));
Debug.Assert((rowIndex >= 0) && (rowIndex < DataGridView.Rows.Count));
if (DataGridView is null ||
Copy link
Member

@Tanya-Solyanik Tanya-Solyanik Jan 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

With this change you don't need null-check on line 842

columnIndex < 0 || columnIndex >= DataGridView.Columns.Count ||
rowIndex < 0 || rowIndex >= DataGridView.Rows.Count)
{
return;
}

int visibleRowIndex = DataGridView.Rows.GetRowCount(DataGridViewElementStates.Visible, 0, rowIndex);
int visibleColumnIndex = DataGridView.Columns.ColumnIndexToActualDisplayIndex(columnIndex, DataGridViewElementStates.Visible);
Expand Down Expand Up @@ -1004,6 +1007,11 @@ protected override void Paint(
{
ArgumentNullException.ThrowIfNull(cellStyle);

if (DataGridView is null)
{
return;
}

PaintPrivate(
graphics,
clipBounds,
Expand Down
6 changes: 5 additions & 1 deletion src/System.Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewRow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,9 +786,13 @@ private void BuildInheritedRowHeaderCellStyle(DataGridViewCellStyle inheritedCel

private void BuildInheritedRowStyle(int rowIndex, DataGridViewCellStyle inheritedRowStyle)
{
if (DataGridView is null)
{
return;
}

Debug.Assert(inheritedRowStyle is not null);
Debug.Assert(rowIndex >= 0);
Debug.Assert(DataGridView is not null);

DataGridViewCellStyle? rowStyle = null;
if (HasDefaultCellStyle)
Expand Down
6 changes: 5 additions & 1 deletion ...Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewRowHeaderCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,11 @@ private Rectangle PaintPrivate(

bool cellSelected = (dataGridViewElementState & DataGridViewElementStates.Selected) != 0;

Debug.Assert(DataGridView is not null);
if (DataGridView is null)
{
return Rectangle.Empty;
}

if (DataGridView.ApplyVisualStylesToHeaderCells)
{
if (cellStyle.Padding != Padding.Empty)
Expand Down
5 changes: 5 additions & 0 deletions ...m.Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewTextBoxCell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,11 @@ protected override void Paint(
{
ArgumentNullException.ThrowIfNull(cellStyle);

if (DataGridView is null)
{
return;
}

PaintPrivate(
graphics,
clipBounds,
Expand Down