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

feat: add InnerContent to AutoCompleteBox and NumericUpDown.

Browse Source
This commit is contained in:
Zhang Dian 2024-02-23 17:56:27 +08:00
parent 6459a8be1b
commit 3a83c67c6c
7 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Directory.Build.props
View File

@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.0.7</AvaloniaVersion>
<AvaloniaVersion>11.1.999-cibuild0045273-beta</AvaloniaVersion>
</PropertyGroup>
</Project>

11
demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
View File

@ -70,5 +70,16 @@
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
<AutoCompleteBox
InnerLeftContent="https://"
InnerRightContent=".com"
ItemsSource="{Binding States}"
ValueMemberBinding="{ReflectionBinding Name}">
<AutoCompleteBox.ItemTemplate>
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
</StackPanel>
</UserControl>

6
demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
View File

@ -37,5 +37,11 @@
Classes="Small"
Maximum="100"
Minimum="0" />
<NumericUpDown
Width="200"
InnerLeftContent="Price"
InnerRightContent="$"
Maximum="100"
Minimum="0" />
</StackPanel>
</UserControl>

2
src/Package.props
View File

@ -7,7 +7,7 @@
<Authors>IRIHI Technology</Authors>
<Description>Avalonia Theme inspired by Semi Design.</Description>
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
<AvaloniaVersion>11.0.7</AvaloniaVersion>
<AvaloniaVersion>11.1.999-cibuild0045273-beta</AvaloniaVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>
</Project>

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

@ -19,6 +19,8 @@
VerticalAlignment="Center"
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
Theme="{DynamicResource NonErrorTextBox}"
InnerLeftContent="{TemplateBinding InnerLeftContent}"
InnerRightContent="{TemplateBinding InnerRightContent}"
Watermark="{TemplateBinding Watermark}" />
<Popup
Name="PART_Popup"

2
src/Semi.Avalonia/Controls/NumericUpDown.axaml
View File

@ -35,6 +35,8 @@
Text="{TemplateBinding Text}"
TextWrapping="NoWrap"
Theme="{DynamicResource NonErrorTextBox}"
InnerLeftContent="{TemplateBinding InnerLeftContent}"
InnerRightContent="{TemplateBinding InnerRightContent}"
Watermark="{TemplateBinding Watermark}" />
</ButtonSpinner>
</DataValidationErrors>

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

@ -264,7 +264,7 @@
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}">
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *">
<Grid Margin="{TemplateBinding Padding}" ColumnDefinitions="Auto, *, Auto">
<ContentPresenter
Grid.Column="0"
Padding="{DynamicResource TextBoxInnerLeftContentPadding}"
@ -308,6 +308,13 @@
TextWrapping="{TemplateBinding TextWrapping}" />
</Panel>
</ScrollViewer>
<ContentPresenter
Grid.Column="2"
Padding="{DynamicResource TextBoxInnerRightContentPadding}"
VerticalAlignment="Center"
Content="{TemplateBinding InnerRightContent}"
Foreground="{DynamicResource TextBoxInnerForeground}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=InnerRightContent, Converter={x:Static ObjectConverters.IsNotNull}}" />
</Grid>
</Border>
</DataValidationErrors>