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

Merge pull request #749 from Samuel-B-D/fix-multicombobox-items-in-axaml

Browse Source 
Fix MultiComboBox to works with items added in axaml
This commit is contained in:
Dong Bin
2025-08-29 01:30:52 +08:00
committed by GitHub
parent eb8383f2ae ca3e78c3a7
commit da93b01c14
5 changed files with 107 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml
View File

@@ -11,6 +11,8 @@
x:CompileBindings="True"
x:DataType="vm:MultiComboBoxDemoViewModel"
mc:Ignorable="d">
<StackPanel Orientation="Vertical">
<TextBlock>Binded ItemsSource</TextBlock>
<StackPanel Orientation="Horizontal">
<u:MultiComboBox
Watermark="Please Select"
@@ -19,6 +21,7 @@
SelectedItems="{Binding SelectedItems}"
ItemsSource="{Binding Items}" >
</u:MultiComboBox>
<u:MultiComboBox
Name="combo"
Watermark="Please Select"
@@ -42,6 +45,22 @@
</MenuFlyout>
</u:MultiComboBox.ContextFlyout>
</u:MultiComboBox>
<ListBox ItemsSource="{Binding SelectedItems}" />
</StackPanel>
<Separator Margin="0 20" />
<TextBlock>Items inside axaml (u:MultiComboBox's tag content)</TextBlock>
<u:MultiComboBox
Watermark="Please Select"
Width="300"
MaxHeight="200">
<u:MultiComboBoxItem>option 1</u:MultiComboBoxItem>
<u:MultiComboBoxItem>option 2</u:MultiComboBoxItem>
<u:MultiComboBoxItem>option 3</u:MultiComboBoxItem>
<u:MultiComboBoxItem><Button>option 4</Button></u:MultiComboBoxItem>
<Button>option 5</Button>
</u:MultiComboBox>
</StackPanel>
</UserControl>

7
src/Ursa.Themes.Semi/Controls/TagInput.axaml
View File

@@ -135,7 +135,14 @@
Command="{TemplateBinding Command}"
CommandParameter="{TemplateBinding}"
Content="{StaticResource ClosableTagCloseIconGlyph}" />
<Border
IsVisible="{TemplateBinding VisualContent, Converter={x:Static ObjectConverters.IsNotNull}}"
Background="{TemplateBinding VisualContent}"
Width="{TemplateBinding VisualContentWidth}"
Height="{TemplateBinding VisualContentHeight}"
IsHitTestVisible="False" />
<ContentPresenter
IsVisible="{TemplateBinding VisualContent, Converter={x:Static ObjectConverters.IsNull}}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"

15
src/Ursa/Controls/ComboBox/MultiComboBox.cs
View File

@@ -179,6 +179,19 @@ public class MultiComboBox : SelectingItemsControl, IInnerContentControl, IPopup
return new MultiComboBoxItem();
}
protected override void PrepareContainerForItemOverride(Control container, object? item, int index)
{
if (item is MultiComboBoxItem containerItem)
{
container.DataContext = containerItem.Content;
return;
}
container.DataContext = item;
base.PrepareContainerForItemOverride(container, item, index);
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
@@ -202,7 +215,7 @@ public class MultiComboBox : SelectingItemsControl, IInnerContentControl, IPopup
{
if (o is StyledElement s)
{
var data = s.DataContext;
var data = s is ClosableTag { VisualContent: not null } c ? c.Content : s.DataContext;
SelectedItems?.Remove(data);
var item = Items.FirstOrDefault(a => ReferenceEquals(a, data));
if (item is not null)

11
src/Ursa/Controls/ComboBox/MultiComboBoxSelectedItemList.cs
View File

@@ -1,6 +1,8 @@
using System.Windows.Input;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Layout;
using Avalonia.Media;
namespace Ursa.Controls;
@@ -31,6 +33,15 @@ public class MultiComboBoxSelectedItemList: ItemsControl
if (container is ClosableTag tag)
{
tag.Command = RemoveCommand;
if (item is Layoutable visualContent)
{
tag.VisualContent = new VisualBrush
{
Visual = visualContent,
};
tag.VisualContentWidth = visualContent.Bounds.Width;
tag.VisualContentHeight = visualContent.Bounds.Height;
}
}
}
}

28
src/Ursa/Controls/TagInput/ClosableTag.cs
View File

@@ -2,6 +2,7 @@ using System.Windows.Input;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Metadata;
using Avalonia.Media;
namespace Ursa.Controls;
@@ -13,9 +14,36 @@ public class ClosableTag : ContentControl
public static readonly StyledProperty<ICommand?> CommandProperty = AvaloniaProperty.Register<ClosableTag, ICommand?>(
nameof(Command));
public static readonly StyledProperty<VisualBrush?> VisualContentProperty = AvaloniaProperty.Register<ClosableTag, VisualBrush?>(
nameof(VisualContent));
public static readonly StyledProperty<double?> VisualContentWidthProperty = AvaloniaProperty.Register<ClosableTag, double?>(
nameof(VisualContentWidth));
public static readonly StyledProperty<double?> VisualContentHeightProperty = AvaloniaProperty.Register<ClosableTag, double?>(
nameof(VisualContentHeight));
public ICommand? Command
{
get => GetValue(CommandProperty);
set => SetValue(CommandProperty, value);
}
public VisualBrush? VisualContent
{
get => GetValue(VisualContentProperty);
set => SetValue(VisualContentProperty, value);
}
public double? VisualContentWidth
{
get => GetValue(VisualContentWidthProperty);
set => SetValue(VisualContentWidthProperty, value);
}
public double? VisualContentHeight
{
get => GetValue(VisualContentHeightProperty);
set => SetValue(VisualContentHeightProperty, value);
}
}