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

Merge remote-tracking branch 'origin/multi-auto' into multi-auto

Browse Source 
# Conflicts:
#	demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml
#	demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs
#	src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml
This commit is contained in:
rabbitism
2025-09-17 01:02:36 +08:00
parent f4cad108f4 68cdd4609f
commit fe9cc21a65
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Ursa.Demo/Pages/MultiAutoCompleteBoxDemo.axaml
View File

@@ -13,7 +13,7 @@
MaxWidth="400" MaxWidth="400"
InnerLeftContent="Controls" InnerLeftContent="Controls"
SelectedItems="{Binding SelectedItems}" SelectedItems="{Binding SelectedItems}"
ItemFilter="{Binding FilterPredicate }" ItemFilter="{Binding FilterPredicate}"
FilterMode="Custom"> FilterMode="Custom">
<u:MultiAutoCompleteBox.ItemTemplate> <u:MultiAutoCompleteBox.ItemTemplate>
<DataTemplate DataType="vm:ControlData"> <DataTemplate DataType="vm:ControlData">

2
demo/Ursa.Demo/ViewModels/MultiAutoCompleteBoxDemoViewModel.cs
View File

@@ -6,7 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
namespace Ursa.Demo.ViewModels; namespace Ursa.Demo.ViewModels;
public class MultiAutoCompleteBoxDemoViewModel: ObservableObject public class MultiAutoCompleteBoxDemoViewModel : ObservableObject
{ {
public ObservableCollection<ControlData> Items { get; set; } public ObservableCollection<ControlData> Items { get; set; }
public ObservableCollection<ControlData> SelectedItems { get; set; } public ObservableCollection<ControlData> SelectedItems { get; set; }

3
src/Ursa.Themes.Semi/Controls/MultiAutoCompleteBox.axaml
View File

@@ -1,11 +1,10 @@
<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 -->
<ControlTheme x:Key="{x:Type u:MultiAutoCompleteBox}" TargetType="u:MultiAutoCompleteBox"> <ControlTheme x:Key="{x:Type u:MultiAutoCompleteBox}" TargetType="u:MultiAutoCompleteBox">
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
<Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" /> <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}"></Setter> <Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="u:MultiAutoCompleteBox"> <ControlTemplate TargetType="u:MultiAutoCompleteBox">
<Panel> <Panel>

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

@@ -63,7 +63,7 @@
</ControlTheme> </ControlTheme>
<ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox"> <ControlTheme x:Key="TagInputTextBoxTheme" TargetType="TextBox">
<Setter Property="Foreground" Value="{DynamicResource TextBoxInnerForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
<Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
<Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" /> <Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />