feat: fix content preparation logic.
This commit is contained in:
@@ -1,17 +1,37 @@
|
|||||||
<UserControl xmlns="https://github.com/avaloniaui"
|
<UserControl
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
x:Class="Ursa.Demo.Pages.BreadcrumbDemo"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:u="https://irihi.tech/ursa"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
mc:Ignorable="d" d:DesignWidth="800"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
d:DesignHeight="450"
|
xmlns:u="https://irihi.tech/ursa"
|
||||||
x:Class="Ursa.Demo.Pages.BreadcrumbDemo">
|
xmlns:vm="using:Ursa.Demo.ViewModels"
|
||||||
|
xmlns:converters="clr-namespace:Ursa.Demo.Converters"
|
||||||
|
d:DesignHeight="450"
|
||||||
|
d:DesignWidth="800"
|
||||||
|
x:CompileBindings="True"
|
||||||
|
x:DataType="vm:BreadcrumbDemoViewModel"
|
||||||
|
mc:Ignorable="d">
|
||||||
|
<UserControl.Resources>
|
||||||
|
<converters:IconNameToPathConverter x:Key="IconConverter" />
|
||||||
|
</UserControl.Resources>
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<u:Breadcrumb >
|
|
||||||
<TextBlock Text="Hello"></TextBlock>
|
<u:Breadcrumb>
|
||||||
<u:BreadcrumbItem Icon="?" Separator="♥"></u:BreadcrumbItem>
|
<TextBlock Text="Hello" />
|
||||||
<TextBlock Text="Avalonia"></TextBlock>
|
<u:BreadcrumbItem Icon="?" Separator="♥" />
|
||||||
<TextBlock Text="Ursa"></TextBlock>
|
<TextBlock Text="Avalonia" />
|
||||||
|
<TextBlock Text="Ursa" />
|
||||||
|
</u:Breadcrumb>
|
||||||
|
<u:Breadcrumb
|
||||||
|
DisplayMemberBinding="{Binding Section}"
|
||||||
|
IconBinding="{Binding Icon}"
|
||||||
|
ItemsSource="{Binding Items1}">
|
||||||
|
<u:Breadcrumb.IconTemplate>
|
||||||
|
<DataTemplate DataType="x:String">
|
||||||
|
<PathIcon Width="12" Height="12" Data="{Binding Path=., Converter={StaticResource IconConverter}}"></PathIcon>
|
||||||
|
</DataTemplate>
|
||||||
|
</u:Breadcrumb.IconTemplate>
|
||||||
</u:Breadcrumb>
|
</u:Breadcrumb>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -1,8 +1,26 @@
|
|||||||
|
using System.Collections.ObjectModel;
|
||||||
using CommunityToolkit.Mvvm.ComponentModel;
|
using CommunityToolkit.Mvvm.ComponentModel;
|
||||||
|
|
||||||
namespace Ursa.Demo.ViewModels;
|
namespace Ursa.Demo.ViewModels;
|
||||||
|
|
||||||
public class BreadcrumbDemoViewModel: ObservableObject
|
public class BreadcrumbDemoViewModel: ObservableObject
|
||||||
{
|
{
|
||||||
|
public ObservableCollection<BreadcrumbDemoItem> Items1 { get; set; }
|
||||||
|
|
||||||
|
public BreadcrumbDemoViewModel()
|
||||||
|
{
|
||||||
|
Items1 = new ObservableCollection<BreadcrumbDemoItem>()
|
||||||
|
{
|
||||||
|
new BreadcrumbDemoItem() { Section = "Home", Icon = "Home" },
|
||||||
|
new BreadcrumbDemoItem() { Section = "Page 1", Icon = "Page" },
|
||||||
|
new BreadcrumbDemoItem() { Section = "Page 2", Icon = "Page" },
|
||||||
|
new BreadcrumbDemoItem() { Section = "Page 3", Icon = "Page" },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BreadcrumbDemoItem: ObservableObject
|
||||||
|
{
|
||||||
|
public string Section { get; set; }
|
||||||
|
public string Icon { get; set; }
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,18 @@
|
|||||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:u="https://irihi.tech/ursa">
|
xmlns:u="https://irihi.tech/ursa">
|
||||||
<!-- Add Resources Here -->
|
<Design.PreviewWith>
|
||||||
|
<StackPanel>
|
||||||
|
<u:Breadcrumb >
|
||||||
|
<TextBlock Text="Hello"></TextBlock>
|
||||||
|
<u:BreadcrumbItem Icon="?" Separator="♥"></u:BreadcrumbItem>
|
||||||
|
<TextBlock Text="Avalonia"></TextBlock>
|
||||||
|
<TextBlock Text="Ursa"></TextBlock>
|
||||||
|
</u:Breadcrumb>
|
||||||
|
</StackPanel>
|
||||||
|
</Design.PreviewWith>
|
||||||
<ControlTheme x:Key="{x:Type u:Breadcrumb}" TargetType="u:Breadcrumb">
|
<ControlTheme x:Key="{x:Type u:Breadcrumb}" TargetType="u:Breadcrumb">
|
||||||
|
<Setter Property="Separator" Value="/"></Setter>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="u:Breadcrumb">
|
<ControlTemplate TargetType="u:Breadcrumb">
|
||||||
<ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
|
<ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
|
||||||
@@ -15,8 +25,8 @@
|
|||||||
<ControlTemplate TargetType="u:BreadcrumbItem">
|
<ControlTemplate TargetType="u:BreadcrumbItem">
|
||||||
<Border BorderBrush="Red" BorderThickness="2" Margin="4">
|
<Border BorderBrush="Red" BorderThickness="2" Margin="4">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<ContentPresenter Content="{TemplateBinding Icon}" />
|
<ContentPresenter Content="{TemplateBinding Icon}" ContentTemplate="{TemplateBinding IconTemplate}" />
|
||||||
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}"/>
|
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
|
||||||
<ContentPresenter Name="Separator" Content="{TemplateBinding Separator}"></ContentPresenter>
|
<ContentPresenter Name="Separator" Content="{TemplateBinding Separator}"></ContentPresenter>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ using Avalonia.Controls.Templates;
|
|||||||
using Avalonia.Data;
|
using Avalonia.Data;
|
||||||
using Avalonia.Layout;
|
using Avalonia.Layout;
|
||||||
using Avalonia.Metadata;
|
using Avalonia.Metadata;
|
||||||
using Irihi.Avalonia.Shared.Helpers;
|
|
||||||
|
|
||||||
namespace Ursa.Controls;
|
namespace Ursa.Controls;
|
||||||
|
|
||||||
@@ -84,7 +83,8 @@ public class Breadcrumb: ItemsControl
|
|||||||
|
|
||||||
protected override void PrepareContainerForItemOverride(Control container, object? item, int index)
|
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 (container is not BreadcrumbItem breadcrumbItem) return;
|
||||||
if (!breadcrumbItem.IsSet(BreadcrumbItem.SeparatorProperty))
|
if (!breadcrumbItem.IsSet(BreadcrumbItem.SeparatorProperty))
|
||||||
{
|
{
|
||||||
@@ -98,6 +98,14 @@ public class Breadcrumb: ItemsControl
|
|||||||
breadcrumbItem.Separator = b;
|
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)
|
if (!breadcrumbItem.IsSet(BreadcrumbItem.IconProperty) && IconBinding != null)
|
||||||
{
|
{
|
||||||
breadcrumbItem[!BreadcrumbItem.IconProperty] = IconBinding;
|
breadcrumbItem[!BreadcrumbItem.IconProperty] = IconBinding;
|
||||||
|
|||||||
Reference in New Issue
Block a user