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

Merge pull request #329 from irihitech/293-bs-dian

Browse Source 
ComboBox, DatePicker and TimePicker BackgroundSizing
This commit is contained in:
Dong Bin 2024-03-28 01:10:05 +08:00 committed by GitHub
commit 9bb50a7190
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 195 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,29 +26,7 @@
</DataTemplate> </DataTemplate>
</Setter> </Setter>
</Style> </Style>
<Style Selector="AutoCompleteBox.Split">
<Setter Property="Width" Value="100" />
</Style>
</StackPanel.Styles> </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 <AutoCompleteBox
Watermark="Please select a State" Watermark="Please select a State"
@ -70,5 +48,41 @@
InnerLeftContent="https://" InnerLeftContent="https://"
InnerRightContent=".com" InnerRightContent=".com"
ValueMemberBinding="{ReflectionBinding Name}" /> ValueMemberBinding="{ReflectionBinding Name}" />
<StackPanel Orientation="Horizontal">
<AutoCompleteBox
Width="100"
Classes="Large"
Watermark="Large"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
Width="100"
Watermark="Default"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
Width="100"
Classes="Small"
Watermark="Small"
ValueMemberBinding="{ReflectionBinding Name}" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<AutoCompleteBox
Width="100"
IsEnabled="False"
Watermark="Disabled"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
Width="100"
Classes="Bordered"
Watermark="Bordered"
ValueMemberBinding="{ReflectionBinding Name}" />
<AutoCompleteBox
Width="100"
Classes="Bordered"
IsEnabled="False"
ValueMemberBinding="{ReflectionBinding Name}" />
</StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

95
demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml
View File

@ -4,71 +4,40 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" xmlns:pages="clr-namespace:Semi.Avalonia.Demo.Pages"
d:DesignHeight="800"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<Design.DataContext>
<pages:ComboBoxDemoViewModel />
</Design.DataContext>
<StackPanel Spacing="20"> <StackPanel Spacing="20">
<ComboBox Width="150"> <StackPanel.Styles>
<ComboBoxItem>Ding</ComboBoxItem> <Style Selector="ComboBox">
<ComboBoxItem>Otter</ComboBoxItem> <Setter Property="Width" Value="300" />
<ComboBoxItem>Husky</ComboBoxItem> <Setter Property="ItemsSource" Value="{Binding Items}" />
<ComboBoxItem>Mr. 17</ComboBoxItem> </Style>
<ComboBoxItem>Cass</ComboBoxItem> </StackPanel.Styles>
</ComboBox>
<ComboBox Width="150" Classes="ClearButton"> <ComboBox />
<ComboBoxItem>Ding</ComboBoxItem> <ComboBox Classes="ClearButton" />
<ComboBoxItem>Otter</ComboBoxItem> <ComboBox PlaceholderText="Please Select" />
<ComboBoxItem>Husky</ComboBoxItem> <ComboBox IsEnabled="False" />
<ComboBoxItem>Mr. 17</ComboBoxItem> <ComboBox Classes="Large" IsEnabled="False" />
<ComboBoxItem>Cass</ComboBoxItem> <ComboBox Classes="Small" />
</ComboBox> <ComboBox Classes="Bordered" />
<ComboBox Width="150" PlaceholderText="Please Select"> <ComboBox Classes="Bordered" IsEnabled="False" />
<ComboBoxItem>Ding</ComboBoxItem>
<ComboBoxItem>Otter</ComboBoxItem> <StackPanel Orientation="Horizontal">
<ComboBoxItem>Husky</ComboBoxItem> <ComboBox Width="100" Classes="Large" PlaceholderText="Large" />
<ComboBoxItem>Mr. 17</ComboBoxItem> <ComboBox Width="100" PlaceholderText="Default" />
<ComboBoxItem>Cass</ComboBoxItem> <ComboBox Width="100" Classes="Small" PlaceholderText="Small" />
</ComboBox> </StackPanel>
<ComboBox Width="150" IsEnabled="False">
<ComboBoxItem>Ding</ComboBoxItem> <StackPanel Orientation="Horizontal">
<ComboBoxItem>Otter</ComboBoxItem> <ComboBox Width="100" IsEnabled="False" PlaceholderText="Disabled" />
<ComboBoxItem>Husky</ComboBoxItem> <ComboBox Width="100" Classes="Bordered" PlaceholderText="Bordered" />
<ComboBoxItem>Mr. 17</ComboBoxItem> <ComboBox Width="100" Classes="Bordered" IsEnabled="False" />
<ComboBoxItem>Cass</ComboBoxItem> </StackPanel>
</ComboBox>
<ComboBox
Width="150"
Classes="Large"
IsEnabled="False">
<ComboBoxItem>Ding</ComboBoxItem>
<ComboBoxItem>Otter</ComboBoxItem>
<ComboBoxItem>Husky</ComboBoxItem>
<ComboBoxItem>Mr. 17</ComboBoxItem>
<ComboBoxItem>Cass</ComboBoxItem>
</ComboBox>
<ComboBox Width="150" Classes="Small">
<ComboBoxItem>Ding</ComboBoxItem>
<ComboBoxItem>Otter</ComboBoxItem>
<ComboBoxItem>Husky</ComboBoxItem>
<ComboBoxItem>Mr. 17</ComboBoxItem>
<ComboBoxItem>Cass</ComboBoxItem>
</ComboBox>
<ComboBox Width="150" Classes="Bordered">
<ComboBoxItem>Ding</ComboBoxItem>
<ComboBoxItem>Otter</ComboBoxItem>
<ComboBoxItem>Husky</ComboBoxItem>
<ComboBoxItem>Mr. 17</ComboBoxItem>
<ComboBoxItem>Cass</ComboBoxItem>
</ComboBox>
<ComboBox
Width="150"
Classes="Bordered"
IsEnabled="False">
<ComboBoxItem>Ding</ComboBoxItem>
<ComboBoxItem>Otter</ComboBoxItem>
<ComboBoxItem>Husky</ComboBoxItem>
<ComboBoxItem>Mr. 17</ComboBoxItem>
<ComboBoxItem>Cass</ComboBoxItem>
</ComboBox>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

10
demo/Semi.Avalonia.Demo/Pages/ComboBoxDemo.axaml.cs
View File

@ -1,6 +1,6 @@
using Avalonia; using System.Collections.ObjectModel;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Markup.Xaml; using CommunityToolkit.Mvvm.ComponentModel;
namespace Semi.Avalonia.Demo.Pages; namespace Semi.Avalonia.Demo.Pages;
@ -9,5 +9,11 @@ public partial class ComboBoxDemo : UserControl
public ComboBoxDemo() public ComboBoxDemo()
{ {
InitializeComponent(); InitializeComponent();
this.DataContext = new ComboBoxDemoViewModel();
} }
}
public class ComboBoxDemoViewModel : ObservableObject
{
public ObservableCollection<string> Items { get; set; } = ["Ding", "Otter", "Husky", "Mr.17", "Cass"];
} }

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

@ -14,5 +14,16 @@
<DatePicker IsEnabled="False" /> <DatePicker IsEnabled="False" />
<DatePicker Classes="Large" /> <DatePicker Classes="Large" />
<DatePicker Classes="Small" /> <DatePicker Classes="Small" />
<StackPanel Orientation="Horizontal">
<DatePicker Classes="Large" />
<DatePicker />
<DatePicker Classes="Small" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<DatePicker IsEnabled="False" />
<DatePicker Classes="Bordered" />
<DatePicker Classes="Bordered" IsEnabled="False" />
</StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

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

@ -4,62 +4,53 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="450" d:DesignHeight="800"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel HorizontalAlignment="Left" Spacing="20"> <StackPanel HorizontalAlignment="Left" Spacing="20">
<StackPanel.Styles>
<Style Selector="NumericUpDown">
<Setter Property="Width" Value="300" />
<Setter Property="Maximum" Value="100" />
<Setter Property="Minimum" Value="0" />
</Style>
</StackPanel.Styles>
<NumericUpDown />
<NumericUpDown Increment="10" />
<NumericUpDown ButtonSpinnerLocation="Left" />
<NumericUpDown ShowButtonSpinner="False" />
<NumericUpDown Classes="Large" />
<NumericUpDown Classes="Small" />
<NumericUpDown InnerLeftContent="Price" InnerRightContent="$" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<NumericUpDown Classes="Large" Width="150" ButtonSpinnerLocation="Left"/> <NumericUpDown
<NumericUpDown Width="150" ShowButtonSpinner="False" /> Width="100"
<NumericUpDown Classes="Small" Width="150" /> Classes="Large"
Watermark="Large"
ButtonSpinnerLocation="Left" />
<NumericUpDown
Width="100"
Watermark="Default"
ShowButtonSpinner="False" />
<NumericUpDown
Width="100"
Watermark="Small"
Classes="Small" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<NumericUpDown Width="150" ButtonSpinnerLocation="Left" /> <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
<NumericUpDown Width="150" ShowButtonSpinner="False" /> <NumericUpDown Width="100" ShowButtonSpinner="False" />
<NumericUpDown Width="150" /> <NumericUpDown Width="100" />
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<NumericUpDown Width="150" ShowButtonSpinner="False" /> <NumericUpDown Width="100" ShowButtonSpinner="False" />
<NumericUpDown IsEnabled="False" Width="150" /> <NumericUpDown Width="100" IsEnabled="False" />
<NumericUpDown Width="150" ButtonSpinnerLocation="Left" /> <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
</StackPanel> </StackPanel>
<NumericUpDown
Width="200"
Maximum="100"
Minimum="0" />
<NumericUpDown
Width="200"
Increment="10"
Maximum="100"
Minimum="0" />
<NumericUpDown
Width="200"
ButtonSpinnerLocation="Left"
Maximum="100"
Minimum="0" />
<NumericUpDown
Width="200"
Maximum="100"
Minimum="0"
ShowButtonSpinner="False" />
<NumericUpDown
Width="200"
Classes="Large"
Maximum="100"
Minimum="0" />
<NumericUpDown
Width="200"
Classes="Small"
Maximum="100"
Minimum="0" />
<NumericUpDown
Width="200"
InnerLeftContent="Price"
InnerRightContent="$"
Maximum="100"
Minimum="0" />
</StackPanel> </StackPanel>
</UserControl> </UserControl>

2
demo/Semi.Avalonia.Demo/Pages/SplitViewDemo.axaml
View File

@ -14,11 +14,13 @@
Orientation="Vertical" Orientation="Vertical"
Spacing="4"> Spacing="4">
<ToggleButton <ToggleButton
HorizontalAlignment="Stretch"
Name="PaneOpenButton" Name="PaneOpenButton"
Content="IsPaneOpen" Content="IsPaneOpen"
IsChecked="{Binding IsPaneOpen, ElementName=SplitView}" /> IsChecked="{Binding IsPaneOpen, ElementName=SplitView}" />
<ToggleButton <ToggleButton
HorizontalAlignment="Stretch"
Name="UseLightDismissOverlayModeButton" Name="UseLightDismissOverlayModeButton"
Content="UseLightDismissOverlayMode" Content="UseLightDismissOverlayMode"
IsChecked="{Binding UseLightDismissOverlayMode, ElementName=SplitView}" /> IsChecked="{Binding UseLightDismissOverlayMode, ElementName=SplitView}" />

42
demo/Semi.Avalonia.Demo/Pages/TextBoxDemo.axaml
View File

@ -5,23 +5,11 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:system="clr-namespace:System;assembly=netstandard" xmlns:system="clr-namespace:System;assembly=netstandard"
d:DesignHeight="450" d:DesignHeight="800"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<ScrollViewer> <ScrollViewer>
<StackPanel HorizontalAlignment="Left" Spacing="20"> <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" />
<TextBox Width="300" Classes="Large" /> <TextBox Width="300" Classes="Large" />
<TextBox Width="300" Classes="Small" /> <TextBox Width="300" Classes="Small" />
@ -54,6 +42,34 @@
InnerLeftContent="http://" InnerLeftContent="http://"
InnerRightContent=".com" InnerRightContent=".com"
IsEnabled="False" /> IsEnabled="False" />
<StackPanel Orientation="Horizontal">
<TextBox
Width="150"
Classes="Large"
Watermark="Large" />
<TextBox
Width="150"
Watermark="Default" />
<TextBox
Width="150"
Classes="Small"
Watermark="Small" />
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBox
Width="150"
IsEnabled="False"
Watermark="Disabled" />
<TextBox
Width="150"
Classes="Bordered"
Watermark="Bordered" />
<TextBox
Width="150"
Classes="Bordered"
IsEnabled="False" />
</StackPanel>
<TextBox Width="300" Classes="TextArea" /> <TextBox Width="300" Classes="TextArea" />
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>

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

@ -15,5 +15,16 @@
<TimePicker ClockIdentifier="12HourClock" IsEnabled="False" /> <TimePicker ClockIdentifier="12HourClock" IsEnabled="False" />
<TimePicker Classes="Large" /> <TimePicker Classes="Large" />
<TimePicker Classes="Small" /> <TimePicker Classes="Small" />
<StackPanel Orientation="Horizontal">
<TimePicker Classes="Large" ClockIdentifier="12HourClock"/>
<TimePicker ClockIdentifier="12HourClock"/>
<TimePicker Classes="Small" ClockIdentifier="12HourClock"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TimePicker IsEnabled="False" />
<TimePicker Classes="Bordered" />
<TimePicker Classes="Bordered" IsEnabled="False" />
</StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

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

@ -17,7 +17,7 @@
<ToggleButton Classes="Success">Success</ToggleButton> <ToggleButton Classes="Success">Success</ToggleButton>
<ToggleButton Classes="Warning">Warning</ToggleButton> <ToggleButton Classes="Warning">Warning</ToggleButton>
<ToggleButton Classes="Danger">Danger</ToggleButton> <ToggleButton Classes="Danger">Danger</ToggleButton>
<ToggleButton Classes="Danger" IsEnabled="False">Danger</ToggleButton> <ToggleButton Classes="Danger" IsEnabled="False">Disabled</ToggleButton>
</StackPanel> </StackPanel>
<TextBlock Text="Toggle Button Checked State" /> <TextBlock Text="Toggle Button Checked State" />
<StackPanel Orientation="Horizontal" Spacing="20"> <StackPanel Orientation="Horizontal" Spacing="20">
@ -32,7 +32,7 @@
Classes="Danger" Classes="Danger"
IsChecked="True" IsChecked="True"
IsEnabled="False"> IsEnabled="False">
Danger Disabled
</ToggleButton> </ToggleButton>
</StackPanel> </StackPanel>
<TextBlock Text="Toggle Button Three State" /> <TextBlock Text="Toggle Button Three State" />
@ -79,7 +79,7 @@
IsChecked="{x:Null}" IsChecked="{x:Null}"
IsEnabled="False" IsEnabled="False"
IsThreeState="True"> IsThreeState="True">
Danger Disabled
</ToggleButton> </ToggleButton>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">

10
src/Semi.Avalonia/Controls/ComboBox.axaml
View File

@ -32,6 +32,7 @@
<Setter Property="FocusAdorner" Value="{x:Null}" /> <Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="MaxDropDownHeight" Value="504" /> <Setter Property="MaxDropDownHeight" Value="504" />
<Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" /> <Setter Property="Background" Value="{DynamicResource ComboBoxSelectorBackground}" />
<Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
<Setter Property="BorderThickness" Value="1" /> <Setter Property="BorderThickness" Value="1" />
<Setter Property="Cursor" Value="Hand" /> <Setter Property="Cursor" Value="Hand" />
<Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource ComboBoxSelectorCornerRadius}" />
@ -41,6 +42,7 @@
<Setter Property="VerticalContentAlignment" Value="Center" /> <Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Top" /> <Setter Property="VerticalAlignment" Value="Top" />
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxDefaultHeight}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="ComboBox"> <ControlTemplate TargetType="ComboBox">
<DataValidationErrors> <DataValidationErrors>
@ -49,9 +51,8 @@
x:Name="Background" x:Name="Background"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
MinWidth="{DynamicResource ComboBoxThemeMinWidth}"
MinHeight="{DynamicResource ComboBoxDefaultHeight}"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BackgroundSizing="{TemplateBinding BackgroundSizing}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
@ -61,6 +62,7 @@
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
TextTrimming="CharacterEllipsis"
Foreground="{TemplateBinding Foreground}" Foreground="{TemplateBinding Foreground}"
IsVisible="{TemplateBinding SelectionBoxItem, IsVisible="{TemplateBinding SelectionBoxItem,
Converter={x:Static ObjectConverters.IsNull}}" Converter={x:Static ObjectConverters.IsNull}}"
@ -147,10 +149,10 @@
</Style> </Style>
</Style> </Style>
<Style Selector="^.Large /template/ Border#Background"> <Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxLargeHeight}" />
</Style> </Style>
<Style Selector="^.Small /template/ Border#Background"> <Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource ComboBoxSmallHeight}" />
</Style> </Style>

19
src/Semi.Avalonia/Controls/DatePicker.axaml
View File

@ -132,6 +132,7 @@
<Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource DateTimePickerButtonCornerRadius}" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate TargetType="DatePicker"> <ControlTemplate TargetType="DatePicker">
<DataValidationErrors> <DataValidationErrors>
@ -145,7 +146,7 @@
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Width="298" Width="298"
MinWidth="298" MinWidth="298"
MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}" MinHeight="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@ -165,7 +166,7 @@
ColumnDefinitions="78*,Auto,132*,Auto,78*"> ColumnDefinitions="78*,Auto,132*,Auto,78*">
<TextBlock <TextBlock
Name="PART_DayTextBlock" Name="PART_DayTextBlock"
Padding="12,4" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
@ -174,7 +175,7 @@
Text="day" /> Text="day" />
<TextBlock <TextBlock
Name="PART_MonthTextBlock" Name="PART_MonthTextBlock"
Padding="12,4" Padding="12,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
FontSize="{TemplateBinding FontSize}" FontSize="{TemplateBinding FontSize}"
@ -183,7 +184,7 @@
TextAlignment="Left" /> TextAlignment="Left" />
<TextBlock <TextBlock
Name="PART_YearTextBlock" Name="PART_YearTextBlock"
Padding="12,4" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
@ -194,14 +195,16 @@
x:Name="PART_FirstSpacer" x:Name="PART_FirstSpacer"
Grid.Column="1" Grid.Column="1"
Width="1" Width="1"
Margin="0,4" Height="{TemplateBinding Height}"
MinHeight="{TemplateBinding MinHeight}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
<Rectangle <Rectangle
x:Name="PART_SecondSpacer" x:Name="PART_SecondSpacer"
Grid.Column="3" Grid.Column="3"
Width="1" Width="1"
Margin="0,4" Height="{TemplateBinding Height}"
MinHeight="{TemplateBinding MinHeight}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
</Grid> </Grid>
@ -255,10 +258,10 @@
<Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock"> <Style Selector="^:hasnodate /template/ Button#PART_FlyoutButton TextBlock">
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
</Style> </Style>
<Style Selector="^.Large /template/ Button#PART_FlyoutButton"> <Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
</Style> </Style>
<Style Selector="^.Small /template/ Button#PART_FlyoutButton"> <Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>

4
src/Semi.Avalonia/Controls/DateTimePickerShared.axaml
View File

@ -6,7 +6,8 @@
<ControlTheme x:Key="DateTimePickerFlyoutButton" TargetType="Button"> <ControlTheme x:Key="DateTimePickerFlyoutButton" TargetType="Button">
<Setter Property="RenderTransform" Value="none" /> <Setter Property="RenderTransform" Value="none" />
<Setter Property="Button.VerticalAlignment" Value="Stretch" /> <Setter Property="BackgroundSizing" Value="OuterBorderEdge" />
<Setter Property="VerticalAlignment" Value="Stretch" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<ContentPresenter <ContentPresenter
@ -14,6 +15,7 @@
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch" VerticalContentAlignment="Stretch"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
BackgroundSizing="{TemplateBinding BackgroundSizing}"
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"

15
src/Semi.Avalonia/Controls/TimePicker.axaml
View File

@ -136,6 +136,7 @@
<Setter Property="CornerRadius" Value="3" /> <Setter Property="CornerRadius" Value="3" />
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Center" /> <Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<DataValidationErrors> <DataValidationErrors>
@ -149,7 +150,7 @@
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Width="242" Width="242"
MinWidth="242" MinWidth="242"
MinHeight="{DynamicResource DateTimePickerButtonDefaultHeight}" MinHeight="0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
@ -171,7 +172,7 @@
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
x:Name="PART_HourTextBlock" x:Name="PART_HourTextBlock"
Padding="12,4" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
@ -183,7 +184,6 @@
Name="PART_FirstColumnDivider" Name="PART_FirstColumnDivider"
Grid.Column="1" Grid.Column="1"
Width="1" Width="1"
Margin="0,4"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
@ -194,7 +194,7 @@
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
x:Name="PART_MinuteTextBlock" x:Name="PART_MinuteTextBlock"
Padding="12,4" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
@ -206,7 +206,6 @@
Name="PART_SecondColumnDivider" Name="PART_SecondColumnDivider"
Grid.Column="3" Grid.Column="3"
Width="1" Width="1"
Margin="0,4"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Fill="{DynamicResource DateTimePickerSeparatorBackground}" /> Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
@ -217,7 +216,7 @@
VerticalAlignment="Stretch"> VerticalAlignment="Stretch">
<TextBlock <TextBlock
x:Name="PART_PeriodTextBlock" x:Name="PART_PeriodTextBlock"
Padding="12,4" Padding="12,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontFamily="{TemplateBinding FontFamily}" FontFamily="{TemplateBinding FontFamily}"
@ -278,10 +277,10 @@
<Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" /> <Setter Property="Foreground" Value="{DynamicResource DateTimePickerEmptyForeground}" />
</Style> </Style>
<Style Selector="^.Large /template/ Button#PART_FlyoutButton"> <Style Selector="^.Large">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonLargeHeight}" />
</Style> </Style>
<Style Selector="^.Small /template/ Button#PART_FlyoutButton"> <Style Selector="^.Small">
<Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" /> <Setter Property="MinHeight" Value="{DynamicResource DateTimePickerButtonSmallHeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>