zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AutoCompleteBox default Border. Fix TextBox ClearButton layout.

Browse Source
This commit is contained in:
rabbitism 2023-02-09 22:28:58 +08:00
parent c9cc49a67c
commit b591c96968
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
View File

@ -8,6 +8,7 @@
<ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox"> <ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
<Setter Property="Background" Value="{DynamicResource AutoCompleteBoxDefaultBackground}" /> <Setter Property="Background" Value="{DynamicResource AutoCompleteBoxDefaultBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" /> <Setter Property="BorderBrush" Value="{DynamicResource AutoCompleteBoxDefaultBorderBrush}" />
<Setter Property="CornerRadius" Value="{DynamicResource AutoCompleteBoxCornerRadius}" />
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" /> <Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="600" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Template"> <Setter Property="Template">

16
src/Semi.Avalonia/Controls/TextBox.axaml
View File

@ -48,15 +48,13 @@
<Setter Property="Button.Template"> <Setter Property="Button.Template">
<ControlTemplate TargetType="Button"> <ControlTemplate TargetType="Button">
<!-- Background must be transparent or hit test will fail --> <!-- Background must be transparent or hit test will fail -->
<Label Background="Transparent"> <ContentControl Background="Transparent">
<Label.Content> <PathIcon
<PathIcon Width="16"
Width="16" Height="16"
Height="16" Data="{DynamicResource TextBoxClearButtonData}"
Data="{DynamicResource TextBoxClearButtonData}" Foreground="{TemplateBinding Foreground}" />
Foreground="{TemplateBinding Foreground}" /> </ContentControl>
</Label.Content>
</Label>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:pointerover"> <Style Selector="^:pointerover">

1
src/Semi.Avalonia/Themes/Dark/AutoCompleteBox.axaml
View File

@ -9,4 +9,5 @@
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius> <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#E6E8EA" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#E6E8EA" />
<CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</CornerRadius>
</ResourceDictionary> </ResourceDictionary>

1
src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
View File

@ -9,4 +9,5 @@
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius> <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />
<CornerRadius x:Key="AutoCompleteBoxCornerRadius">3</CornerRadius>
</ResourceDictionary> </ResourceDictionary>