Skip to content

fix [Accessibility] Accessibility Insights tool keeps loading when mouse-over DataGridView #10343 #10372

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 1 commit into from
Dec 13, 2023
Merged

fix [Accessibility] Accessibility Insights tool keeps loading when mouse-over DataGridView #10343 #10372

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
2 changes: 2 additions & 0 deletions src/System.Windows.Forms/src/PublicAPI.Unshipped.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*REMOVED*virtual System.Windows.Forms.Control.ControlCollection.AddRange(System.Windows.Forms.Control![]! controls) -> void
*REMOVED*virtual System.Windows.Forms.ListView.ColumnHeaderCollection.AddRange(System.Windows.Forms.ColumnHeader![]! values) -> void
*REMOVED*virtual System.Windows.Forms.TreeNodeCollection.AddRange(System.Windows.Forms.TreeNode![]! nodes) -> void
*REMOVED*override System.Windows.Forms.DataGridViewTextBoxEditingControl.OnHandleCreated(System.EventArgs! e) -> void
*REMOVED*override System.Windows.Forms.DataGridViewComboBoxEditingControl.OnHandleCreated(System.EventArgs! e) -> void
System.Windows.Forms.AutoCompleteStringCollection.AddRange(params string![]! value) -> void
System.Windows.Forms.ComboBox.ObjectCollection.AddRange(params object![]! items) -> void
System.Windows.Forms.ImageList.ImageCollection.AddRange(params System.Drawing.Image![]! images) -> void
Expand Down
21 changes: 6 additions & 15 deletions ...orms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewComboBoxEditingControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ public DataGridViewComboBoxEditingControl() : base()
TabStop = false;
}

protected override AccessibleObject CreateAccessibilityInstance() =>
new DataGridViewComboBoxEditingControlAccessibleObject(this);

// IDataGridViewEditingControl interface implementation
protected override AccessibleObject CreateAccessibilityInstance()
{
var controlAccessibleObject = new DataGridViewComboBoxEditingControlAccessibleObject(this);
_dataGridView?.SetAccessibleObjectParent(controlAccessibleObject);
return controlAccessibleObject;
}

public virtual DataGridView? EditingControlDataGridView
{
Expand Down Expand Up @@ -124,17 +126,6 @@ protected override void OnSelectedIndexChanged(EventArgs e)
}
}

protected override void OnHandleCreated(EventArgs e)
{
base.OnHandleCreated(e);

// The null-check was added as a fix for a https://github.com/dotnet/winforms/issues/2138
if (_dataGridView?.IsAccessibilityObjectCreated == true)
{
_dataGridView.SetAccessibleObjectParent(AccessibilityObject);
}
}

internal override void ReleaseUiaProvider(HWND handle)
{
if (TryGetAccessibilityObject(out AccessibleObject? accessibleObject))
Expand Down
17 changes: 5 additions & 12 deletions ...Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridViewTextBoxEditingControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ public DataGridViewTextBoxEditingControl() : base()
}

protected override AccessibleObject CreateAccessibilityInstance()
=> new DataGridViewTextBoxEditingControlAccessibleObject(this);
{
var controlAccessibleObject = new DataGridViewTextBoxEditingControlAccessibleObject(this);
_dataGridView?.SetAccessibleObjectParent(controlAccessibleObject);
return controlAccessibleObject;
}

public virtual DataGridView? EditingControlDataGridView
{
Expand Down Expand Up @@ -309,15 +313,4 @@ private static HorizontalAlignment TranslateAlignment(DataGridViewContentAlignme
return HorizontalAlignment.Left;
}
}

protected override void OnHandleCreated(EventArgs e)
{
base.OnHandleCreated(e);

// The null-check was added as a fix for a https://github.com/dotnet/winforms/issues/2138
if (IsHandleCreated && _dataGridView?.IsAccessibilityObjectCreated == true)
{
_dataGridView.SetAccessibleObjectParent(AccessibilityObject);
}
}
}