diff --git a/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml b/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml index 5b604af..9d94a94 100644 --- a/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml +++ b/demo/Ursa.Demo/Pages/MultiComboBoxDemo.axaml @@ -17,7 +17,8 @@ InnerLeftContent="Left" InnerRightContent="Right" Classes="ClearButton" - ItemsSource="{Binding Items}" /> + ItemsSource="{Binding Items}" > + diff --git a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml index 39e3338..ff38168 100644 --- a/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml +++ b/src/Ursa.Themes.Semi/Controls/MultiComboBox.axaml @@ -50,6 +50,7 @@ HorizontalScrollBarVisibility="Disabled"> diff --git a/src/Ursa.Themes.Semi/Controls/TagInput.axaml b/src/Ursa.Themes.Semi/Controls/TagInput.axaml index 4e49cf0..d79f9a6 100644 --- a/src/Ursa.Themes.Semi/Controls/TagInput.axaml +++ b/src/Ursa.Themes.Semi/Controls/TagInput.axaml @@ -121,11 +121,12 @@ Data="{DynamicResource ClosableTagCloseIconGlyph}" DockPanel.Dock="Right" Foreground="{TemplateBinding Foreground}" /> - diff --git a/src/Ursa/Controls/ComboBox/MultiComboBox.cs b/src/Ursa/Controls/ComboBox/MultiComboBox.cs index 1ca8e7d..85620bf 100644 --- a/src/Ursa/Controls/ComboBox/MultiComboBox.cs +++ b/src/Ursa/Controls/ComboBox/MultiComboBox.cs @@ -79,6 +79,15 @@ public class MultiComboBox: SelectingItemsControl, IInnerContentControl get => GetValue(InnerRightContentProperty); set => SetValue(InnerRightContentProperty, value); } + + public static readonly StyledProperty SelectedItemTemplateProperty = AvaloniaProperty.Register( + nameof(SelectedItemTemplate)); + + public IDataTemplate? SelectedItemTemplate + { + get => GetValue(SelectedItemTemplateProperty); + set => SetValue(SelectedItemTemplateProperty, value); + } static MultiComboBox() { diff --git a/src/Ursa/Controls/ComboBox/MultiComboBoxItem.cs b/src/Ursa/Controls/ComboBox/MultiComboBoxItem.cs index ccfa1f2..b56ae98 100644 --- a/src/Ursa/Controls/ComboBox/MultiComboBoxItem.cs +++ b/src/Ursa/Controls/ComboBox/MultiComboBoxItem.cs @@ -87,7 +87,7 @@ public class MultiComboBoxItem: ContentControl e.InitialPressMouseButton is MouseButton.Left or MouseButton.Right) { var point = e.GetCurrentPoint(this); - if (new Rect(Bounds.Size).ContainsExclusive(point.Position)) + if (new Rect(Bounds.Size).ContainsExclusive(point.Position) && e.Pointer.Type == PointerType.Touch) { this.IsSelected = !this.IsSelected; e.Handled = true;