Merge remote-tracking branch 'origin/multi-auto' into multi-auto
# 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:
@@ -1,11 +1,10 @@
|
||||
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:u="https://irihi.tech/ursa">
|
||||
<!-- Add Resources Here -->
|
||||
<ControlTheme x:Key="{x:Type u:MultiAutoCompleteBox}" TargetType="u:MultiAutoCompleteBox">
|
||||
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
|
||||
<Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
|
||||
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}"></Setter>
|
||||
<Setter Property="CornerRadius" Value="{DynamicResource TextBoxDefaultCornerRadius}" />
|
||||
<Setter Property="Template">
|
||||
<ControlTemplate TargetType="u:MultiAutoCompleteBox">
|
||||
<Panel>
|
||||
@@ -85,4 +84,4 @@
|
||||
</ControlTemplate>
|
||||
</Setter>
|
||||
</ControlTheme>
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary>
|
||||
@@ -63,7 +63,7 @@
|
||||
</ControlTheme>
|
||||
|
||||
<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="BorderBrush" Value="{DynamicResource TextBoxDefaultBorderBrush}" />
|
||||
<Setter Property="SelectionBrush" Value="{DynamicResource TextBoxSelectionBackground}" />
|
||||
|
||||
Reference in New Issue
Block a user