Skip to content

fixes(DataGrid): Issue #6508 does not re-enter the edit mode after pressing ESC #6509

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 3 commits into from
Sep 10, 2021
Merged

fixes(DataGrid): Issue #6508 does not re-enter the edit mode after pressing ESC #6509

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68370e3
fixes(DataGrid): Issue #6508 does not re-enter the edit mode after pr…
workgroupengineering Aug 31, 2021
b4d8767
Merge branch 'master' into fixes/Issue_6508
workgroupengineering Sep 10, 2021
7a8650a
fixes(Datagrid): Avoid using Threading.Dispatcher.UIThread.Post(
workgroupengineering Sep 10, 2021
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
16 changes: 13 additions & 3 deletions src/Avalonia.Controls.DataGrid/DataGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,17 +4489,27 @@ private void PopulateCellContent(bool isCellEdited,
element = dataGridColumn.GenerateEditingElementInternal(dataGridCell, dataGridRow.DataContext);
if (element != null)
{
// Subscribe to the new element's events
element.Initialized += EditingElement_Initialized;

dataGridCell.Content = element;
if (element.IsInitialized)
{
PreparingCellForEditPrivate(element as Control);
}
else
{
// Subscribe to the new element's events
element.Initialized += EditingElement_Initialized;
}
}
}
else
{
// Generate Element and apply column style if available
element = dataGridColumn.GenerateElementInternal(dataGridCell, dataGridRow.DataContext);
dataGridCell.Content = element;
}

dataGridCell.Content = element;

}

private void PreparingCellForEditPrivate(Control editingElement)
Expand Down