chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: fix content preparation logic.

Browse Source
This commit is contained in:
rabbitism
2024-03-03 15:00:38 +08:00
parent 39bc26c28e
commit dfff263786
4 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Ursa/Controls/Breadcrumb/Breadcrumb.cs
View File

@@ -4,7 +4,6 @@ using Avalonia.Controls.Templates;
using Avalonia.Data;
using Avalonia.Layout;
using Avalonia.Metadata;
using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
@@ -84,7 +83,8 @@ public class Breadcrumb: ItemsControl
protected override void PrepareContainerForItemOverride(Control container, object? item, int index)
{
base.PrepareContainerForItemOverride(container, item, index);
// base.PrepareContainerForItemOverride(container, item, index);
if (container == item) return;
if (container is not BreadcrumbItem breadcrumbItem) return;
if (!breadcrumbItem.IsSet(BreadcrumbItem.SeparatorProperty))
{
@@ -98,6 +98,14 @@ public class Breadcrumb: ItemsControl
breadcrumbItem.Separator = b;
});
}
if(!breadcrumbItem.IsSet(ContentControl.ContentProperty))
{
breadcrumbItem.SetCurrentValue(ContentControl.ContentProperty, item);
if (DisplayMemberBinding is not null)
{
breadcrumbItem[!ContentControl.ContentProperty] = DisplayMemberBinding;
}
}
if (!breadcrumbItem.IsSet(BreadcrumbItem.IconProperty) && IconBinding != null)
{
breadcrumbItem[!BreadcrumbItem.IconProperty] = IconBinding;