Skip to content

Fix dynamic resource propagation into TDG headers and Cells (wire up the logical tree) #361

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+30 −1
Open

Fix dynamic resource propagation into TDG headers and Cells (wire up the logical tree) #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00781d3
fix dynamic resources not propagating into TDG cells and headers beca…
danwalmsley May 16, 2025
2e04319
ensure removal from logical tree as unrealized items are trimmed.
danwalmsley May 16, 2025
d50c5cf
(optional) add the presenters to the logical tree so that users can i…
danwalmsley May 16, 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
16 changes: 16 additions & 0 deletions src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridPresenterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@ private Control GetRecycledOrCreateElement(IReadOnlyList<TItem> items, int index
if (e.GetVisualParent() is null)
{
((ISetLogicalParent)e).SetParent(this);
LogicalChildren.Add(e);
VisualChildren.Add(e);
}
return e;
Expand Down Expand Up @@ -729,6 +730,21 @@ private void TrimUnrealizedChildren()
}
}
}

var logicalChildren = LogicalChildren;

if (logicalChildren.Count > count)
{
for (var i = logicalChildren.Count - 1; i >= 0; --i)
{
var child = logicalChildren[i];

if (child is Visual { IsVisible: false })
{
logicalChildren.RemoveAt(i);
}
}
}
}

private void OnItemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
Expand Down
5 changes: 5 additions & 0 deletions src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridRow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
base.OnApplyTemplate(e);
CellsPresenter = e.NameScope.Find<TreeDataGridCellsPresenter>("PART_CellsPresenter");

if (CellsPresenter is { })
{
LogicalChildren.Add(CellsPresenter);
}

if (RowIndex >= 0)
CellsPresenter?.Realize(RowIndex);
}
Expand Down
10 changes: 9 additions & 1 deletion src/Avalonia.Controls.TreeDataGrid/TreeDataGrid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,16 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
}

base.OnApplyTemplate(e);
ColumnHeadersPresenter = e.NameScope.Find<TreeDataGridColumnHeadersPresenter>("PART_ColumnHeadersPresenter");
ColumnHeadersPresenter =
e.NameScope.Find<TreeDataGridColumnHeadersPresenter>("PART_ColumnHeadersPresenter");
RowsPresenter = e.NameScope.Find<TreeDataGridRowsPresenter>("PART_RowsPresenter");

if (ColumnHeadersPresenter is { })
LogicalChildren.Add(ColumnHeadersPresenter);

if(RowsPresenter is { })
LogicalChildren.Add(RowsPresenter);

Scroll = e.NameScope.Find<ScrollViewer>("PART_ScrollViewer");
_headerScroll = e.NameScope.Find<ScrollViewer>("PART_HeaderScrollViewer");

Expand Down