feat: upgrade to 11.2.0-beta1
This commit is contained in:
parent
bac851a87f
commit
35abc7445f
@ -1,6 +1,6 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AvaloniaVersion>11.1.3</AvaloniaVersion>
|
<AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<StackPanel Spacing="20">
|
<StackPanel Spacing="20">
|
||||||
<TimePicker />
|
<TimePicker />
|
||||||
|
<TimePicker UseSeconds="True" />
|
||||||
<TimePicker Classes="ClearButton" />
|
<TimePicker Classes="ClearButton" />
|
||||||
<TimePicker MinuteIncrement="15" />
|
<TimePicker MinuteIncrement="15" />
|
||||||
<TimePicker ClockIdentifier="24HourClock" />
|
<TimePicker ClockIdentifier="24HourClock" />
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
<PackageIcon>irihi.png</PackageIcon>
|
<PackageIcon>irihi.png</PackageIcon>
|
||||||
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
|
||||||
<AvaloniaVersion>11.1.0</AvaloniaVersion>
|
<AvaloniaVersion>11.2.0-beta1</AvaloniaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -55,7 +55,19 @@
|
|||||||
<RepeatButton Name="PART_MinuteDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
|
<RepeatButton Name="PART_MinuteDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
|
||||||
</Panel>
|
</Panel>
|
||||||
|
|
||||||
<Panel Name="PART_PeriodHost" Grid.Column="4">
|
<Panel Name="PART_SecondHost" Grid.Column="4">
|
||||||
|
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
|
||||||
|
<DateTimePickerPanel
|
||||||
|
Name="PART_SecondSelector"
|
||||||
|
ItemHeight="{DynamicResource DateTimePickerListBoxItemHeight}"
|
||||||
|
PanelType="Second"
|
||||||
|
ShouldLoop="True" />
|
||||||
|
</ScrollViewer>
|
||||||
|
<RepeatButton Name="PART_SecondUpButton" Theme="{StaticResource DateTimePickerUpButton}" />
|
||||||
|
<RepeatButton Name="PART_SecondDownButton" Theme="{StaticResource DateTimePickerDownButton}" />
|
||||||
|
</Panel>
|
||||||
|
|
||||||
|
<Panel Name="PART_PeriodHost" Grid.Column="6">
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
|
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Hidden">
|
||||||
<DateTimePickerPanel
|
<DateTimePickerPanel
|
||||||
Name="PART_PeriodSelector"
|
Name="PART_PeriodSelector"
|
||||||
@ -81,6 +93,13 @@
|
|||||||
Margin="0,4"
|
Margin="0,4"
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
|
<Rectangle
|
||||||
|
Name="PART_ThirdSpacer"
|
||||||
|
Grid.Column="5"
|
||||||
|
Width="1"
|
||||||
|
Margin="0,4"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
@ -216,6 +235,29 @@
|
|||||||
Grid.Column="4"
|
Grid.Column="4"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch">
|
VerticalAlignment="Stretch">
|
||||||
|
<TextBlock
|
||||||
|
x:Name="PART_SecondTextBlock"
|
||||||
|
Padding="12,0"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
FontFamily="{TemplateBinding FontFamily}"
|
||||||
|
FontSize="{TemplateBinding FontSize}"
|
||||||
|
FontWeight="{TemplateBinding FontWeight}"
|
||||||
|
Text="{DynamicResource STRING_TIMEPICKER_SECOND_TEXT}"/>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Rectangle
|
||||||
|
Name="PART_ThirdColumnDivider"
|
||||||
|
Grid.Column="5"
|
||||||
|
Width="1"
|
||||||
|
HorizontalAlignment="Center"
|
||||||
|
Fill="{DynamicResource DateTimePickerSeparatorBackground}" />
|
||||||
|
|
||||||
|
<Border
|
||||||
|
x:Name="PART_FourthPickerHost"
|
||||||
|
Grid.Column="6"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PART_PeriodTextBlock"
|
x:Name="PART_PeriodTextBlock"
|
||||||
Padding="12,0"
|
Padding="12,0"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
<!-- TimePicker -->
|
<!-- TimePicker -->
|
||||||
<x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">hour</x:String>
|
<x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">hour</x:String>
|
||||||
<x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">minute</x:String>
|
<x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">minute</x:String>
|
||||||
|
<x:String x:Key="STRING_TIMEPICKER_SECOND_TEXT">second</x:String>
|
||||||
<!-- TextBox/SelectableTextBox flyout -->
|
<!-- TextBox/SelectableTextBox flyout -->
|
||||||
<x:String x:Key="STRING_MENU_CUT">Cut</x:String>
|
<x:String x:Key="STRING_MENU_CUT">Cut</x:String>
|
||||||
<x:String x:Key="STRING_MENU_COPY">Copy</x:String>
|
<x:String x:Key="STRING_MENU_COPY">Copy</x:String>
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
<!-- TimePicker -->
|
<!-- TimePicker -->
|
||||||
<x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">时</x:String>
|
<x:String x:Key="STRING_TIMEPICKER_HOUR_TEXT">时</x:String>
|
||||||
<x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">分</x:String>
|
<x:String x:Key="STRING_TIMEPICKER_MINUTE_TEXT">分</x:String>
|
||||||
|
<x:String x:Key="STRING_TIMEPICKER_SECOND_TEXT">秒</x:String>
|
||||||
<!-- TextBox/SelectableTextBox flyout -->
|
<!-- TextBox/SelectableTextBox flyout -->
|
||||||
<x:String x:Key="STRING_MENU_CUT">剪切</x:String>
|
<x:String x:Key="STRING_MENU_CUT">剪切</x:String>
|
||||||
<x:String x:Key="STRING_MENU_COPY">复制</x:String>
|
<x:String x:Key="STRING_MENU_COPY">复制</x:String>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user