mirror of
https://gitcode.com/gh_mirrors/se/Semi.Avalonia
synced 2026-03-23 02:06:34 +08:00
Compare commits
9 Commits
editorconf
...
v11.3.7.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d57c843032 | ||
|
|
a56b1e374a | ||
|
|
664d05db45 | ||
|
|
fdbfd91b8f | ||
|
|
3b0b007a40 | ||
|
|
c1eff9ddf8 | ||
|
|
4285e6e227 | ||
|
|
edacd88fa7 | ||
|
|
136d577667 |
1907
.editorconfig
1907
.editorconfig
File diff suppressed because it is too large
Load Diff
@@ -1,8 +1,8 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
<AvaloniaVersion>11.3.10</AvaloniaVersion>
|
<AvaloniaVersion>11.3.11</AvaloniaVersion>
|
||||||
<DataGridVersion>11.3.10</DataGridVersion>
|
<DataGridVersion>11.3.11</DataGridVersion>
|
||||||
<SkiaSharpVersion>3.119.1</SkiaSharpVersion>
|
<SkiaSharpVersion>3.119.1</SkiaSharpVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -22,6 +22,15 @@
|
|||||||
TickFrequency="10"
|
TickFrequency="10"
|
||||||
TickPlacement="Outside"
|
TickPlacement="Outside"
|
||||||
Value="0" />
|
Value="0" />
|
||||||
|
<Slider
|
||||||
|
Value="0"
|
||||||
|
Minimum="0"
|
||||||
|
Maximum="100"
|
||||||
|
TickPlacement="BottomRight"
|
||||||
|
IsSnapToTickEnabled="True"
|
||||||
|
IsDirectionReversed="True"
|
||||||
|
Ticks="0,20,25,40,75,100"
|
||||||
|
Width="300" />
|
||||||
<Slider
|
<Slider
|
||||||
Width="300"
|
Width="300"
|
||||||
Classes="ToolTip"
|
Classes="ToolTip"
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
|
||||||
<Version>11.3.7.2</Version>
|
<Version>11.3.7.3</Version>
|
||||||
<PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.2</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 11.3.7.3</PackageReleaseNotes>
|
||||||
<Title>Semi.Avalonia.ColorPicker</Title>
|
<Title>Semi.Avalonia.ColorPicker</Title>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
|
||||||
<Version>11.3.7.2</Version>
|
<Version>11.3.7.3</Version>
|
||||||
<PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.2</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to Semi.Avalonia.DataGrid 11.3.7.3</PackageReleaseNotes>
|
||||||
<Title>Semi.Avalonia.DataGrid</Title>
|
<Title>Semi.Avalonia.DataGrid</Title>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
Name="PART_TextBox"
|
Name="PART_TextBox"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{TemplateBinding MinHeight}"
|
||||||
|
ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
|
||||||
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
||||||
Theme="{DynamicResource NonErrorTextBox}"
|
Theme="{DynamicResource NonErrorTextBox}"
|
||||||
InnerLeftContent="{TemplateBinding InnerLeftContent}"
|
InnerLeftContent="{TemplateBinding InnerLeftContent}"
|
||||||
@@ -62,6 +63,7 @@
|
|||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
MinHeight="0"
|
MinHeight="0"
|
||||||
Classes="Bordered"
|
Classes="Bordered"
|
||||||
|
ClearSelectionOnLostFocus="{TemplateBinding ClearSelectionOnLostFocus}"
|
||||||
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
|
||||||
Watermark="{TemplateBinding Watermark}" />
|
Watermark="{TemplateBinding Watermark}" />
|
||||||
<Popup
|
<Popup
|
||||||
|
|||||||
@@ -50,21 +50,33 @@
|
|||||||
Data="{StaticResource WindowExpandGlyph}"
|
Data="{StaticResource WindowExpandGlyph}"
|
||||||
Foreground="{Binding $parent[Button].Foreground}" />
|
Foreground="{Binding $parent[Button].Foreground}" />
|
||||||
</Button>
|
</Button>
|
||||||
<Button Name="PART_MinimizeButton" Theme="{StaticResource CaptionButton}">
|
<Button
|
||||||
|
Name="PART_MinimizeButton"
|
||||||
|
Theme="{StaticResource CaptionButton}"
|
||||||
|
AutomationProperties.Name="Minimize"
|
||||||
|
Win32Properties.NonClientHitTestResult="MinButton">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="PART_MinimizeButtonIcon"
|
Name="PART_MinimizeButtonIcon"
|
||||||
Theme="{StaticResource InnerPathIcon}"
|
Theme="{StaticResource InnerPathIcon}"
|
||||||
Data="{StaticResource WindowMinimizeGlyph}"
|
Data="{StaticResource WindowMinimizeGlyph}"
|
||||||
Foreground="{Binding $parent[Button].Foreground}" />
|
Foreground="{Binding $parent[Button].Foreground}" />
|
||||||
</Button>
|
</Button>
|
||||||
<Button Name="PART_RestoreButton" Theme="{StaticResource CaptionButton}">
|
<Button
|
||||||
|
Name="PART_RestoreButton"
|
||||||
|
Theme="{StaticResource CaptionButton}"
|
||||||
|
AutomationProperties.Name="Maximize"
|
||||||
|
Win32Properties.NonClientHitTestResult="MaxButton">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="PART_RestoreButtonIcon"
|
Name="PART_RestoreButtonIcon"
|
||||||
Theme="{StaticResource InnerPathIcon}"
|
Theme="{StaticResource InnerPathIcon}"
|
||||||
Data="{StaticResource WindowMaximizeGlyph}"
|
Data="{StaticResource WindowMaximizeGlyph}"
|
||||||
Foreground="{Binding $parent[Button].Foreground}" />
|
Foreground="{Binding $parent[Button].Foreground}" />
|
||||||
</Button>
|
</Button>
|
||||||
<Button Name="PART_CloseButton" Theme="{StaticResource CaptionButton}">
|
<Button
|
||||||
|
Name="PART_CloseButton"
|
||||||
|
Theme="{StaticResource CaptionButton}"
|
||||||
|
AutomationProperties.Name="Close"
|
||||||
|
Win32Properties.NonClientHitTestResult="Close">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Name="PART_CloseButtonIcon"
|
Name="PART_CloseButtonIcon"
|
||||||
Theme="{StaticResource InnerPathIcon}"
|
Theme="{StaticResource InnerPathIcon}"
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<Design.PreviewWith>
|
<Design.PreviewWith>
|
||||||
<Border Padding="20">
|
<StackPanel Margin="20">
|
||||||
<DatePickerPresenter />
|
<DatePickerPresenter />
|
||||||
</Border>
|
<DatePicker Width="500" />
|
||||||
|
</StackPanel>
|
||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
<ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
|
<ControlTheme x:Key="{x:Type DatePickerPresenter}" TargetType="DatePickerPresenter">
|
||||||
<Setter Property="Width" Value="296" />
|
<Setter Property="Width" Value="296" />
|
||||||
@@ -141,6 +142,7 @@
|
|||||||
<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="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
|
||||||
|
<Setter Property="MinWidth" Value="296" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate TargetType="DatePicker">
|
<ControlTemplate TargetType="DatePicker">
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -152,8 +154,8 @@
|
|||||||
Name="PART_FlyoutButton"
|
Name="PART_FlyoutButton"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
Width="298"
|
MinWidth="{TemplateBinding MinWidth}"
|
||||||
MinWidth="298"
|
MaxWidth="{TemplateBinding MaxWidth}"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{TemplateBinding MinHeight}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
MinWidth="{StaticResource ScrollBarThickness}"
|
MinWidth="{StaticResource ScrollBarThickness}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Column left"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}">
|
Theme="{StaticResource ScrollBarRepeatButton}">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Theme="{StaticResource InnerPathIcon}"
|
Theme="{StaticResource InnerPathIcon}"
|
||||||
@@ -76,6 +77,7 @@
|
|||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Page left"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}" />
|
Theme="{StaticResource ScrollBarRepeatButton}" />
|
||||||
</Track.DecreaseButton>
|
</Track.DecreaseButton>
|
||||||
<Track.IncreaseButton>
|
<Track.IncreaseButton>
|
||||||
@@ -86,9 +88,10 @@
|
|||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Page right"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}" />
|
Theme="{StaticResource ScrollBarRepeatButton}" />
|
||||||
</Track.IncreaseButton>
|
</Track.IncreaseButton>
|
||||||
<Thumb Name="thumb" />
|
<Thumb Name="thumb" AutomationProperties.Name="Position" />
|
||||||
</Track>
|
</Track>
|
||||||
<RepeatButton
|
<RepeatButton
|
||||||
Name="PART_LineDownButton"
|
Name="PART_LineDownButton"
|
||||||
@@ -97,6 +100,7 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Column right"
|
||||||
Theme="{DynamicResource ScrollBarRepeatButton}">
|
Theme="{DynamicResource ScrollBarRepeatButton}">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Theme="{DynamicResource InnerPathIcon}"
|
Theme="{DynamicResource InnerPathIcon}"
|
||||||
@@ -124,6 +128,7 @@
|
|||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Line up"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}">
|
Theme="{StaticResource ScrollBarRepeatButton}">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Theme="{StaticResource InnerPathIcon}"
|
Theme="{StaticResource InnerPathIcon}"
|
||||||
@@ -147,6 +152,7 @@
|
|||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Page up"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}" />
|
Theme="{StaticResource ScrollBarRepeatButton}" />
|
||||||
</Track.DecreaseButton>
|
</Track.DecreaseButton>
|
||||||
<Track.IncreaseButton>
|
<Track.IncreaseButton>
|
||||||
@@ -157,9 +163,10 @@
|
|||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Page down"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}" />
|
Theme="{StaticResource ScrollBarRepeatButton}" />
|
||||||
</Track.IncreaseButton>
|
</Track.IncreaseButton>
|
||||||
<Thumb Name="thumb" />
|
<Thumb Name="thumb" AutomationProperties.Name="Position" />
|
||||||
</Track>
|
</Track>
|
||||||
<RepeatButton
|
<RepeatButton
|
||||||
Name="PART_LineDownButton"
|
Name="PART_LineDownButton"
|
||||||
@@ -168,6 +175,7 @@
|
|||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
Focusable="False"
|
Focusable="False"
|
||||||
|
AutomationProperties.Name="Line down"
|
||||||
Theme="{StaticResource ScrollBarRepeatButton}">
|
Theme="{StaticResource ScrollBarRepeatButton}">
|
||||||
<PathIcon
|
<PathIcon
|
||||||
Theme="{StaticResource InnerPathIcon}"
|
Theme="{StaticResource InnerPathIcon}"
|
||||||
|
|||||||
@@ -2,7 +2,10 @@
|
|||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
|
||||||
<MenuFlyout x:Key="SelectableTextBlockContextFlyout" Placement="Bottom">
|
<MenuFlyout
|
||||||
|
x:Key="SelectableTextBlockContextFlyout"
|
||||||
|
ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
|
||||||
|
Placement="Bottom">
|
||||||
<MenuItem
|
<MenuItem
|
||||||
Command="{Binding $parent[SelectableTextBlock].Copy}"
|
Command="{Binding $parent[SelectableTextBlock].Copy}"
|
||||||
Header="{DynamicResource STRING_MENU_COPY}"
|
Header="{DynamicResource STRING_MENU_COPY}"
|
||||||
|
|||||||
@@ -92,11 +92,12 @@
|
|||||||
VerticalAlignment="Bottom"
|
VerticalAlignment="Bottom"
|
||||||
Fill="{DynamicResource SliderTickForeground}"
|
Fill="{DynamicResource SliderTickForeground}"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
Maximum="{TemplateBinding Slider.Maximum}"
|
Maximum="{TemplateBinding Maximum}"
|
||||||
Minimum="{TemplateBinding Slider.Minimum}"
|
Minimum="{TemplateBinding Minimum}"
|
||||||
Orientation="{TemplateBinding Slider.Orientation}"
|
Orientation="{TemplateBinding Orientation}"
|
||||||
Placement="Top"
|
Placement="Top"
|
||||||
TickFrequency="{TemplateBinding Slider.TickFrequency}"
|
IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
|
||||||
|
TickFrequency="{TemplateBinding TickFrequency}"
|
||||||
Ticks="{TemplateBinding Ticks}" />
|
Ticks="{TemplateBinding Ticks}" />
|
||||||
<TickBar
|
<TickBar
|
||||||
Name="BottomTickBar"
|
Name="BottomTickBar"
|
||||||
@@ -106,11 +107,12 @@
|
|||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Fill="{DynamicResource SliderTickForeground}"
|
Fill="{DynamicResource SliderTickForeground}"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
Maximum="{TemplateBinding Slider.Maximum}"
|
Maximum="{TemplateBinding Maximum}"
|
||||||
Minimum="{TemplateBinding Slider.Minimum}"
|
Minimum="{TemplateBinding Minimum}"
|
||||||
Orientation="{TemplateBinding Slider.Orientation}"
|
Orientation="{TemplateBinding Orientation}"
|
||||||
Placement="Bottom"
|
Placement="Bottom"
|
||||||
TickFrequency="{TemplateBinding Slider.TickFrequency}"
|
IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
|
||||||
|
TickFrequency="{TemplateBinding TickFrequency}"
|
||||||
Ticks="{TemplateBinding Ticks}" />
|
Ticks="{TemplateBinding Ticks}" />
|
||||||
<Track
|
<Track
|
||||||
Name="PART_Track"
|
Name="PART_Track"
|
||||||
@@ -169,11 +171,12 @@
|
|||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
Fill="{DynamicResource SliderTickForeground}"
|
Fill="{DynamicResource SliderTickForeground}"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
Maximum="{TemplateBinding Slider.Maximum}"
|
Maximum="{TemplateBinding Maximum}"
|
||||||
Minimum="{TemplateBinding Slider.Minimum}"
|
Minimum="{TemplateBinding Minimum}"
|
||||||
Orientation="{TemplateBinding Slider.Orientation}"
|
Orientation="{TemplateBinding Orientation}"
|
||||||
Placement="Left"
|
Placement="Left"
|
||||||
TickFrequency="{TemplateBinding Slider.TickFrequency}"
|
IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
|
||||||
|
TickFrequency="{TemplateBinding TickFrequency}"
|
||||||
Ticks="{TemplateBinding Ticks}" />
|
Ticks="{TemplateBinding Ticks}" />
|
||||||
<TickBar
|
<TickBar
|
||||||
Name="RightTickBar"
|
Name="RightTickBar"
|
||||||
@@ -183,11 +186,12 @@
|
|||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Fill="{DynamicResource SliderTickForeground}"
|
Fill="{DynamicResource SliderTickForeground}"
|
||||||
IsVisible="False"
|
IsVisible="False"
|
||||||
Maximum="{TemplateBinding Slider.Maximum}"
|
Maximum="{TemplateBinding Maximum}"
|
||||||
Minimum="{TemplateBinding Slider.Minimum}"
|
Minimum="{TemplateBinding Minimum}"
|
||||||
Orientation="{TemplateBinding Slider.Orientation}"
|
Orientation="{TemplateBinding Orientation}"
|
||||||
Placement="Right"
|
Placement="Right"
|
||||||
TickFrequency="{TemplateBinding Slider.TickFrequency}"
|
IsDirectionReversed="{TemplateBinding IsDirectionReversed}"
|
||||||
|
TickFrequency="{TemplateBinding TickFrequency}"
|
||||||
Ticks="{TemplateBinding Ticks}" />
|
Ticks="{TemplateBinding Ticks}" />
|
||||||
<Track
|
<Track
|
||||||
Name="PART_Track"
|
Name="PART_Track"
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
<ResourceDictionary
|
<ResourceDictionary
|
||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<MenuFlyout x:Key="DefaultTextBoxContextFlyout" Placement="Bottom">
|
<MenuFlyout
|
||||||
|
x:Key="DefaultTextBoxContextFlyout"
|
||||||
|
ShowMode="{OnFormFactor Desktop=Standard, Mobile=Transient}"
|
||||||
|
Placement="Bottom">
|
||||||
<MenuItem
|
<MenuItem
|
||||||
Command="{Binding $parent[TextBox].Cut}"
|
Command="{Binding $parent[TextBox].Cut}"
|
||||||
Header="{DynamicResource STRING_MENU_CUT}"
|
Header="{DynamicResource STRING_MENU_CUT}"
|
||||||
|
|||||||
@@ -2,9 +2,10 @@
|
|||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<Design.PreviewWith>
|
<Design.PreviewWith>
|
||||||
<Border Padding="20">
|
<StackPanel Margin="20">
|
||||||
<TimePickerPresenter />
|
<TimePickerPresenter />
|
||||||
</Border>
|
<TimePicker UseSeconds="True" Width="500" />
|
||||||
|
</StackPanel>
|
||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
<ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
|
<ControlTheme x:Key="{x:Type TimePickerPresenter}" TargetType="TimePickerPresenter">
|
||||||
<Setter Property="Width" Value="242" />
|
<Setter Property="Width" Value="242" />
|
||||||
@@ -163,6 +164,7 @@
|
|||||||
<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="MinHeight" Value="{DynamicResource DateTimePickerButtonDefaultHeight}" />
|
||||||
|
<Setter Property="MinWidth" Value="242" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<ControlTemplate>
|
<ControlTemplate>
|
||||||
<DataValidationErrors>
|
<DataValidationErrors>
|
||||||
@@ -174,8 +176,8 @@
|
|||||||
Name="PART_FlyoutButton"
|
Name="PART_FlyoutButton"
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Grid.ColumnSpan="2"
|
Grid.ColumnSpan="2"
|
||||||
Width="242"
|
MinWidth="{TemplateBinding MinWidth}"
|
||||||
MinWidth="242"
|
MaxWidth="{TemplateBinding MaxWidth}"
|
||||||
MinHeight="{TemplateBinding MinHeight}"
|
MinHeight="{TemplateBinding MinHeight}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
|
|||||||
@@ -16,12 +16,14 @@
|
|||||||
<Border
|
<Border
|
||||||
Name="PART_Background"
|
Name="PART_Background"
|
||||||
Background="{TemplateBinding Background}"
|
Background="{TemplateBinding Background}"
|
||||||
IsHitTestVisible="False" />
|
IsHitTestVisible="False"
|
||||||
|
Win32Properties.NonClientHitTestResult="Caption" />
|
||||||
<CaptionButtons
|
<CaptionButtons
|
||||||
Name="PART_CaptionButtons"
|
Name="PART_CaptionButtons"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Top"
|
VerticalAlignment="Top"
|
||||||
Foreground="{TemplateBinding Foreground}" />
|
Foreground="{TemplateBinding Foreground}"
|
||||||
|
Win32Properties.NonClientHitTestResult="Client" />
|
||||||
</Panel>
|
</Panel>
|
||||||
</Panel>
|
</Panel>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
|
||||||
<Version>11.3.7.2</Version>
|
<Version>11.3.7.3</Version>
|
||||||
<PackageReleaseNotes>Update to Semi.Avalonia 11.3.7.2</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to Semi.Avalonia 11.3.7.3</PackageReleaseNotes>
|
||||||
<Title>Semi.Avalonia</Title>
|
<Title>Semi.Avalonia</Title>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
<StaticResource x:Key="TextBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
|
<StaticResource x:Key="TextBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
|
||||||
<StaticResource x:Key="TextBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
|
<StaticResource x:Key="TextBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
|
||||||
<StaticResource x:Key="TextBoxDefaultCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
|
<StaticResource x:Key="TextBoxDefaultCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
|
||||||
<Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 8 0</Thickness>
|
<Thickness x:Key="TextBoxInnerLeftContentPadding">0 0 12 0</Thickness>
|
||||||
<Thickness x:Key="TextBoxInnerRightContentPadding">8 0 0 0</Thickness>
|
<Thickness x:Key="TextBoxInnerRightContentPadding">12 0 0 0</Thickness>
|
||||||
<Thickness x:Key="TextBoxContentPadding">8 0</Thickness>
|
<Thickness x:Key="TextBoxContentPadding">12 0</Thickness>
|
||||||
<StaticResource x:Key="TextBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
|
<StaticResource x:Key="TextBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
|
||||||
<Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
|
<Thickness x:Key="TextBoxTextAreaContentPadding">12 5</Thickness>
|
||||||
<x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>
|
<x:Double x:Key="TextBoxTextAreaHeight">90</x:Double>
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
<FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
|
<FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
|
||||||
<FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
|
<FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
|
||||||
<FontFamily x:Key="SemiFontFamilyRegular">
|
<FontFamily x:Key="SemiFontFamilyRegular">
|
||||||
Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
|
fonts:Inter#Inter, Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
|
||||||
Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
|
Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
|
||||||
Helvetica, Arial, sans-serif
|
Helvetica, Arial, sans-serif
|
||||||
</FontFamily>
|
</FontFamily>
|
||||||
|
|||||||
Reference in New Issue
Block a user