Browse Source

fix: Issue #5637 (#5638)

* fix: Issue #5637 DataGridTemplateColumn incorrect select template when DataGridRow Recycled

* fixes(DataGrid): Binding Exception on DataGridTemplateColumn
release/0.10.8
workgroupengineering 5 years ago
committed by Steven Kirk
parent
commit
844cc2533a
  1. 36
      src/Avalonia.Controls.DataGrid/DataGridRow.cs

36
src/Avalonia.Controls.DataGrid/DataGridRow.cs

@ -378,13 +378,13 @@ namespace Avalonia.Controls
} }
} }
} }
} }
internal Panel RootElement internal Panel RootElement
{ {
get; get;
private set; private set;
} }
internal int Slot internal int Slot
{ {
@ -638,7 +638,7 @@ namespace Avalonia.Controls
PseudoClasses.Set(":editing", IsEditing); PseudoClasses.Set(":editing", IsEditing);
PseudoClasses.Set(":invalid", !IsValid); PseudoClasses.Set(":invalid", !IsValid);
ApplyHeaderStatus(); ApplyHeaderStatus();
} }
} }
//TODO Animation //TODO Animation
@ -896,7 +896,7 @@ namespace Avalonia.Controls
_detailsElement.ContentHeight = _detailsDesiredHeight; _detailsElement.ContentHeight = _detailsDesiredHeight;
} }
} }
} }
// Makes sure the _detailsDesiredHeight is initialized. We need to measure it to know what // Makes sure the _detailsDesiredHeight is initialized. We need to measure it to know what
// height we want to animate to. Subsequently, we just update that height in response to SizeChanged // height we want to animate to. Subsequently, we just update that height in response to SizeChanged
@ -919,7 +919,7 @@ namespace Avalonia.Controls
//TODO Cleanup //TODO Cleanup
double? _previousDetailsHeight = null; double? _previousDetailsHeight = null;
//TODO Animation //TODO Animation
private void DetailsContent_HeightChanged(double newValue) private void DetailsContent_HeightChanged(double newValue)
{ {
@ -1022,7 +1022,7 @@ namespace Avalonia.Controls
} }
} }
} }
internal void ApplyDetailsTemplate(bool initializeDetailsPreferredHeight) internal void ApplyDetailsTemplate(bool initializeDetailsPreferredHeight)
{ {
if (_detailsElement != null && AreDetailsVisible) if (_detailsElement != null && AreDetailsVisible)
@ -1066,7 +1066,7 @@ namespace Avalonia.Controls
.Subscribe(DetailsContent_MarginChanged); .Subscribe(DetailsContent_MarginChanged);
} }
_detailsElement.Children.Add(_detailsContent); _detailsElement.Children.Add(_detailsContent);
} }
} }
@ -1090,6 +1090,28 @@ namespace Avalonia.Controls
} }
} }
} }
protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
{
if (change.Property == DataContextProperty)
{
var owner = OwningGrid;
if (owner != null && this.IsRecycled)
{
var columns = owner.ColumnsItemsInternal;
var nc = columns.Count;
for (int ci = 0; ci < nc; ci++)
{
if (columns[ci] is DataGridTemplateColumn column)
{
column.RefreshCellContent((Control)this.Cells[column.Index].Content, nameof(DataGridTemplateColumn.CellTemplate));
}
}
}
}
base.OnPropertyChanged(change);
}
} }

Loading…
Cancel
Save