Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix BackgroundSizing of TextBox, CalendarDatePicker, AutoCompleteBox, NumericUpDown #321

Merged
merged 7 commits into from
Mar 20, 2024
Merged

Fix BackgroundSizing of TextBox, CalendarDatePicker, AutoCompleteBox, NumericUpDown #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71e276d
feat: redesign CalendarDatePicker.
zdpcdt Feb 29, 2024
c2d1d0c
fix: CalendarDatePicker BackgroundSizing.
zdpcdt Mar 7, 2024
46e5792
feat: redesign TextBox.
zdpcdt Mar 11, 2024
4d14c84
feat: redesign NumericUpDown.
zdpcdt Mar 11, 2024
bf1a2ca
fix: AutoCompleteBox VerticalAlignment.
zdpcdt Mar 11, 2024
0727804
fix: MinHeight TemplateBinding and names.
zdpcdt Mar 20, 2024
f1d87f7
feat: unify MinHeight based on TextBox.
zdpcdt Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 41 additions & 52 deletions demo/Semi.Avalonia.Demo/Pages/AutoCompleteBoxDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,69 +17,58 @@
<StackPanel.Styles>
<Style Selector="AutoCompleteBox">
<Setter Property="Width" Value="300" />
<Setter Property="ItemsSource">
<Binding Path="States" />
</Setter>
<Setter Property="ItemTemplate">
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</Setter>
</Style>
<Style Selector="AutoCompleteBox.Split">
<Setter Property="Width" Value="100" />
</Style>
</StackPanel.Styles>
<StackPanel Orientation="Horizontal">
<AutoCompleteBox Classes="Split Large"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox Classes="Split"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox Classes="Split Small"
ValueMemberBinding="{ReflectionBinding Name}" />
</StackPanel>

<StackPanel Orientation="Horizontal">
<AutoCompleteBox Classes="Split"
IsEnabled="False"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox Classes="Split Bordered"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox Classes="Split Bordered"
IsEnabled="False"
ValueMemberBinding="{ReflectionBinding Name}" />
</StackPanel>

<AutoCompleteBox
ItemsSource="{Binding States}"
ValueMemberBinding="{Binding Name}"
Watermark="Please select a State">
<AutoCompleteBox.ItemTemplate>
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
Watermark="Please select a State"
ValueMemberBinding="{Binding Name}" />
<AutoCompleteBox
Classes="Large"
ItemsSource="{Binding States}"
ValueMemberBinding="{ReflectionBinding Name}">
<AutoCompleteBox.ItemTemplate>
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
Classes="Small"
ItemsSource="{Binding States}"
ValueMemberBinding="{ReflectionBinding Name}">
<AutoCompleteBox.ItemTemplate>
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
Classes="Bordered"
ItemsSource="{Binding States}"
ValueMemberBinding="{ReflectionBinding Name}">
<AutoCompleteBox.ItemTemplate>
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
IsEnabled="False"
ItemsSource="{Binding States}"
ValueMemberBinding="{ReflectionBinding Name}"
Watermark="Disabled">
<AutoCompleteBox.ItemTemplate>
<DataTemplate DataType="local:StateData">
<TextBlock Text="{Binding Name}" />
</DataTemplate>
</AutoCompleteBox.ItemTemplate>
</AutoCompleteBox>
<AutoCompleteBox
Watermark="Disabled"
ValueMemberBinding="{ReflectionBinding Name}" />
<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>
ValueMemberBinding="{ReflectionBinding Name}" />
</StackPanel>
</UserControl>
</UserControl>
25 changes: 16 additions & 9 deletions demo/Semi.Avalonia.Demo/Pages/CalendarDatePickerDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,22 @@
d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left" Spacing="20">
<CalendarDatePicker />
<CalendarDatePicker Classes="ClearButton" Width="200" />
<StackPanel Orientation="Horizontal">
<CalendarDatePicker Classes="Large" />
<CalendarDatePicker />
<CalendarDatePicker Classes="Small" />
</StackPanel>

<StackPanel Orientation="Horizontal">
<CalendarDatePicker IsEnabled="False" />
<CalendarDatePicker Classes="Bordered" />
<CalendarDatePicker Classes="Bordered" IsEnabled="False" />
</StackPanel>

<CalendarDatePicker Width="500" />
<CalendarDatePicker Classes="Large" />
<CalendarDatePicker Classes="Small" />

<CalendarDatePicker Classes="ClearButton" Width="200" />

<CalendarDatePicker
Name="DatePicker2"
Margin="0,0,0,8"
Expand All @@ -23,9 +34,5 @@
CustomDateFormatString="ddd, MMM d"
SelectedDateFormat="Custom" />
<CalendarDatePicker Margin="0,0,0,8" Watermark="Watermark" />

<CalendarDatePicker IsEnabled="False" />
<CalendarDatePicker Classes="Bordered" />
<CalendarDatePicker Classes="Bordered" IsEnabled="False" />
</StackPanel>
</UserControl>
</UserControl>
20 changes: 19 additions & 1 deletion demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,24 @@
d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left" Spacing="20">
<StackPanel Orientation="Horizontal">
<NumericUpDown Classes="Large" Width="150" ButtonSpinnerLocation="Left"/>
<NumericUpDown Width="150" ShowButtonSpinner="False" />
<NumericUpDown Classes="Small" Width="150" />
</StackPanel>

<StackPanel Orientation="Horizontal">
<NumericUpDown Width="150" ButtonSpinnerLocation="Left" />
<NumericUpDown Width="150" ShowButtonSpinner="False" />
<NumericUpDown Width="150" />
</StackPanel>

<StackPanel Orientation="Horizontal">
<NumericUpDown Width="150" ShowButtonSpinner="False" />
<NumericUpDown IsEnabled="False" Width="150" />
<NumericUpDown Width="150" ButtonSpinnerLocation="Left" />
</StackPanel>

<NumericUpDown
Width="200"
Maximum="100"
Expand Down Expand Up @@ -44,4 +62,4 @@
Maximum="100"
Minimum="0" />
</StackPanel>
</UserControl>
</UserControl>
12 changes: 12 additions & 0 deletions demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@
mc:Ignorable="d">
<ScrollViewer>
<StackPanel HorizontalAlignment="Left" Spacing="20">
<StackPanel Orientation="Horizontal">
<TextBox Classes="Large" Width="150"/>
<TextBox Width="150"/>
<TextBox Classes="Small" Width="150"/>
</StackPanel>

<StackPanel Orientation="Horizontal">
<TextBox IsEnabled="False" Width="150"/>
<TextBox Classes="Bordered" Width="150"/>
<TextBox Classes="Bordered" IsEnabled="False" Width="150"/>
</StackPanel>

<TextBox Width="300" />
<TextBox Width="300" Classes="Large" />
<TextBox Width="300" Classes="Small" />
Expand Down
16 changes: 8 additions & 8 deletions src/Semi.Avalonia/Controls/AutoCompleteBox.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@
</StackPanel>
</Design.PreviewWith>
<ControlTheme x:Key="{x:Type AutoCompleteBox}" TargetType="AutoCompleteBox">
<Setter Property="AutoCompleteBox.VerticalAlignment" Value="Center" />
<Setter Property="AutoCompleteBox.MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
<Setter Property="AutoCompleteBox.MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
<Setter Property="Template">
<ControlTemplate TargetType="AutoCompleteBox">
<DataValidationErrors>
<Panel>
<TextBox
Name="PART_TextBox"
VerticalAlignment="Center"
VerticalAlignment="Stretch"
MinHeight="0"
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
Theme="{DynamicResource NonErrorTextBox}"
InnerLeftContent="{TemplateBinding InnerLeftContent}"
Expand Down Expand Up @@ -55,7 +58,8 @@
<Panel>
<TextBox
Name="PART_TextBox"
VerticalAlignment="Center"
VerticalAlignment="Stretch"
MinHeight="0"
Classes="Bordered"
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
Watermark="{TemplateBinding Watermark}" />
Expand Down Expand Up @@ -85,15 +89,11 @@
</ControlTemplate>
</Setter>
</Style>
<Style Selector="^.Large /template/ TextBox">
<Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxLargeHeight}" />
</Style>
<Style Selector="^.Small /template/ TextBox">
<Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxSmallHeight}" />
</Style>
</ControlTheme>




</ResourceDictionary>
Loading