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

46
demo/Ursa.Demo/Pages/BreadcrumbDemo.axaml
View File

@@ -1,17 +1,37 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa"
mc:Ignorable="d" d:DesignWidth="800"
d:DesignHeight="450"
x:Class="Ursa.Demo.Pages.BreadcrumbDemo">
<UserControl
x:Class="Ursa.Demo.Pages.BreadcrumbDemo"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa"
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>
<u:Breadcrumb >
<TextBlock Text="Hello"></TextBlock>
<u:BreadcrumbItem Icon="?" Separator="♥"></u:BreadcrumbItem>
<TextBlock Text="Avalonia"></TextBlock>
<TextBlock Text="Ursa"></TextBlock>
<u:Breadcrumb>
<TextBlock Text="Hello" />
<u:BreadcrumbItem Icon="?" Separator="♥" />
<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>
</StackPanel>
</UserControl>

20
demo/Ursa.Demo/ViewModels/BreadcrumbDemoViewModel.cs
View File

@@ -1,8 +1,26 @@
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
namespace Ursa.Demo.ViewModels;
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; }
}

16
src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
View File

@@ -1,8 +1,18 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
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">
<Setter Property="Separator" Value="/"></Setter>
<Setter Property="Template">
<ControlTemplate TargetType="u:Breadcrumb">
<ItemsPresenter ItemsPanel="{TemplateBinding ItemsPanel}" />
@@ -15,8 +25,8 @@
<ControlTemplate TargetType="u:BreadcrumbItem">
<Border BorderBrush="Red" BorderThickness="2" Margin="4">
<StackPanel Orientation="Horizontal">
<ContentPresenter Content="{TemplateBinding Icon}" />
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}"/>
<ContentPresenter Content="{TemplateBinding Icon}" ContentTemplate="{TemplateBinding IconTemplate}" />
<ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
<ContentPresenter Name="Separator" Content="{TemplateBinding Separator}"></ContentPresenter>
</StackPanel>
</Border>

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;