Browse Source

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

pull/6509/head
Giuseppe Lippolis 5 years ago
parent
commit
68370e37a5
  1. 15
      src/Avalonia.Controls.DataGrid/DataGrid.cs

15
src/Avalonia.Controls.DataGrid/DataGrid.cs

@ -4489,8 +4489,19 @@ namespace Avalonia.Controls
element = dataGridColumn.GenerateEditingElementInternal(dataGridCell, dataGridRow.DataContext); element = dataGridColumn.GenerateEditingElementInternal(dataGridCell, dataGridRow.DataContext);
if (element != null) if (element != null)
{ {
// Subscribe to the new element's events
element.Initialized += EditingElement_Initialized; if (element.IsInitialized)
{
Threading.Dispatcher.UIThread.Post(() =>
{
PreparingCellForEditPrivate(element as Control);
});
}
else
{
// Subscribe to the new element's events
element.Initialized += EditingElement_Initialized;
}
} }
} }
else else

Loading…
Cancel
Save