mirror of
https://gitcode.com/gh_mirrors/se/Semi.Avalonia
synced 2026-03-08 02:30:50 +08:00
Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
3f1a1ae823 | ||
|
|
6758686c44 | ||
|
|
f08a26bc60 | ||
|
|
de3ffc97b6 | ||
|
|
7da8a03f84 | ||
|
|
ab03be1aea | ||
|
|
4ec2d0cf86 | ||
|
|
757f91a140 | ||
|
|
f6d068b722 | ||
|
|
3a6452cccd | ||
|
|
5ea834d57e | ||
|
|
1d9fe693a3 | ||
|
|
2b867f9c6f | ||
|
|
5ea42844ea | ||
|
|
f819531465 | ||
|
|
8f24b2f332 | ||
|
|
a309729c11 | ||
|
|
d57c843032 | ||
|
|
a56b1e374a | ||
|
|
664d05db45 | ||
|
|
fdbfd91b8f | ||
|
|
3b0b007a40 | ||
|
|
c1eff9ddf8 | ||
|
|
4285e6e227 | ||
|
|
edacd88fa7 | ||
|
|
136d577667 |
@@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
<AvaloniaVersion>12.0.999-cibuild0061987-alpha</AvaloniaVersion>
|
<AvaloniaVersion>12.0.0-preview1</AvaloniaVersion>
|
||||||
<DataGridVersion>11.3.10</DataGridVersion>
|
<DataGridVersion>11.3.10</DataGridVersion>
|
||||||
<SkiaSharpVersion>3.119.1</SkiaSharpVersion>
|
<SkiaSharpVersion>3.119.1</SkiaSharpVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public partial class App : Application
|
|||||||
case IClassicDesktopStyleApplicationLifetime desktop:
|
case IClassicDesktopStyleApplicationLifetime desktop:
|
||||||
// Line below is needed to remove Avalonia data validation.
|
// Line below is needed to remove Avalonia data validation.
|
||||||
// Without this line you will get duplicate validations from both Avalonia and CT
|
// Without this line you will get duplicate validations from both Avalonia and CT
|
||||||
BindingPlugins.DataValidators.RemoveAt(0);
|
// BindingPlugins.DataValidators.RemoveAt(0);
|
||||||
desktop.MainWindow = new MainWindow();
|
desktop.MainWindow = new MainWindow();
|
||||||
break;
|
break;
|
||||||
case ISingleViewApplicationLifetime singleView:
|
case ISingleViewApplicationLifetime singleView:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
<AvaloniaVersion>12.0.999-cibuild0061987-alpha</AvaloniaVersion>
|
<AvaloniaVersion>12.0.0-preview1</AvaloniaVersion>
|
||||||
<DataGridVersion>11.3.7</DataGridVersion>
|
<DataGridVersion>11.3.7</DataGridVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -9,6 +9,6 @@
|
|||||||
<PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
|
<PackageVersion Include="Avalonia.Controls.ColorPicker" Version="$(AvaloniaVersion)"/>
|
||||||
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
|
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="$(DataGridVersion)"/>
|
||||||
<PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1"/>
|
<PackageVersion Include="Avalonia.Controls.TreeDataGrid" Version="11.1.1"/>
|
||||||
<PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-nightly-20260206184422"/>
|
<PackageVersion Include="Irihi.Avalonia.Shared" Version="0.4.0-preview1"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
|
||||||
<Version>12.0.0-nightly-20260210000416</Version>
|
<Version>12.0.0-preview1</Version>
|
||||||
<PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 12.0.0-nightly-20260210000416</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to Semi.Avalonia.ColorPicker 12.0.0-preview1</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>
|
||||||
|
|
||||||
|
|||||||
@@ -4,87 +4,54 @@
|
|||||||
xmlns:semi="https://irihi.tech/semi"
|
xmlns:semi="https://irihi.tech/semi"
|
||||||
xmlns:converters="using:Avalonia.Controls.Converters">
|
xmlns:converters="using:Avalonia.Controls.Converters">
|
||||||
<Design.PreviewWith>
|
<Design.PreviewWith>
|
||||||
<StackPanel Margin="20" Spacing="20">
|
<StackPanel Width="400" Margin="20">
|
||||||
<ProgressBar
|
<ProgressBar />
|
||||||
Width="200"
|
<ProgressBar Value="20" />
|
||||||
Maximum="100"
|
<ProgressBar Value="50" Classes="Success" />
|
||||||
Minimum="0"
|
<ProgressBar Value="80" Classes="Warning" />
|
||||||
ShowProgressText="True"
|
<ProgressBar Value="100" Classes="Error" />
|
||||||
Value="20" />
|
<ProgressBar ShowProgressText="True" />
|
||||||
<ProgressBar
|
<ProgressBar Value="20" ShowProgressText="True" />
|
||||||
Width="200"
|
<ProgressBar Value="50" Classes="Success" ShowProgressText="True" />
|
||||||
IsIndeterminate="True"
|
<ProgressBar Value="80" Classes="Warning" ShowProgressText="True" />
|
||||||
Maximum="100"
|
<ProgressBar Value="100" Classes="Error" ShowProgressText="True" />
|
||||||
Minimum="0"
|
<ProgressBar Classes="Left" ShowProgressText="True" />
|
||||||
ShowProgressText="True"
|
<ProgressBar Value="20" Classes="Left" ShowProgressText="True" />
|
||||||
Value="20" />
|
<ProgressBar Value="50" Classes="Left Success" ShowProgressText="True" />
|
||||||
<ProgressBar
|
<ProgressBar Value="80" Classes="Left Warning" ShowProgressText="True" />
|
||||||
Width="200"
|
<ProgressBar Value="100" Classes="Left Error" ShowProgressText="True" />
|
||||||
Classes="Left"
|
<ProgressBar Classes="Right" ShowProgressText="True" />
|
||||||
IsIndeterminate="True"
|
<ProgressBar Value="20" Classes="Right" ShowProgressText="True" />
|
||||||
Maximum="100"
|
<ProgressBar Value="50" Classes="Right Success" ShowProgressText="True" />
|
||||||
Minimum="0"
|
<ProgressBar Value="80" Classes="Right Warning" ShowProgressText="True" />
|
||||||
ShowProgressText="True"
|
<ProgressBar Value="100" Classes="Right Error" ShowProgressText="True" />
|
||||||
Value="20" />
|
|
||||||
<ProgressBar
|
<StackPanel Orientation="Horizontal">
|
||||||
Width="200"
|
<StackPanel.Styles>
|
||||||
Classes="Left"
|
<Style Selector="ProgressBar">
|
||||||
Maximum="100"
|
<Setter Property="Orientation" Value="Vertical" />
|
||||||
Minimum="0"
|
</Style>
|
||||||
ShowProgressText="True"
|
</StackPanel.Styles>
|
||||||
Value="20" />
|
<ProgressBar />
|
||||||
<ProgressBar
|
<ProgressBar Value="20" />
|
||||||
Width="200"
|
<ProgressBar Value="50" Classes="Success" />
|
||||||
Classes="Right"
|
<ProgressBar Value="80" Classes="Warning" />
|
||||||
Maximum="100"
|
<ProgressBar Value="100" Classes="Error" />
|
||||||
Minimum="0"
|
<ProgressBar ShowProgressText="True" />
|
||||||
ShowProgressText="True"
|
<ProgressBar Value="20" ShowProgressText="True" />
|
||||||
Value="20" />
|
<ProgressBar Value="50" Classes="Success" ShowProgressText="True" />
|
||||||
<StackPanel
|
<ProgressBar Value="80" Classes="Warning" ShowProgressText="True" />
|
||||||
HorizontalAlignment="Left"
|
<ProgressBar Value="100" Classes="Error" ShowProgressText="True" />
|
||||||
Orientation="Horizontal"
|
<ProgressBar Classes="Top" ShowProgressText="True" />
|
||||||
Spacing="20">
|
<ProgressBar Value="20" Classes="Top" ShowProgressText="True" />
|
||||||
<ProgressBar
|
<ProgressBar Value="50" Classes="Top Success" ShowProgressText="True" />
|
||||||
Classes="Left"
|
<ProgressBar Value="80" Classes="Top Warning" ShowProgressText="True" />
|
||||||
Maximum="100"
|
<ProgressBar Value="100" Classes="Top Error" ShowProgressText="True" />
|
||||||
Minimum="0"
|
<ProgressBar Classes="Bottom" ShowProgressText="True" />
|
||||||
Orientation="Vertical"
|
<ProgressBar Value="20" Classes="Bottom" ShowProgressText="True" />
|
||||||
ShowProgressText="True"
|
<ProgressBar Value="50" Classes="Bottom Success" ShowProgressText="True" />
|
||||||
Value="20" />
|
<ProgressBar Value="80" Classes="Bottom Warning" ShowProgressText="True" />
|
||||||
<ProgressBar
|
<ProgressBar Value="100" Classes="Bottom Error" ShowProgressText="True" />
|
||||||
Classes="Right"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="20" />
|
|
||||||
<ProgressBar
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="20" />
|
|
||||||
<ProgressBar
|
|
||||||
Classes="Left"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="False"
|
|
||||||
Value="20" />
|
|
||||||
<ProgressBar
|
|
||||||
IsIndeterminate="True"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="True"
|
|
||||||
Value="20" />
|
|
||||||
<ProgressBar
|
|
||||||
IsIndeterminate="True"
|
|
||||||
Maximum="100"
|
|
||||||
Minimum="0"
|
|
||||||
Orientation="Vertical"
|
|
||||||
ShowProgressText="False"
|
|
||||||
Value="20" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Design.PreviewWith>
|
</Design.PreviewWith>
|
||||||
@@ -115,7 +82,7 @@
|
|||||||
<Panel Name="DeterminateRoot" Opacity="1">
|
<Panel Name="DeterminateRoot" Opacity="1">
|
||||||
<Panel.Transitions>
|
<Panel.Transitions>
|
||||||
<Transitions>
|
<Transitions>
|
||||||
<DoubleTransition Property="Opacity" Duration="0:0:0.197" />
|
<DoubleTransition Property="Opacity" Duration="0:0:0.2" />
|
||||||
</Transitions>
|
</Transitions>
|
||||||
</Panel.Transitions>
|
</Panel.Transitions>
|
||||||
<Border
|
<Border
|
||||||
@@ -127,7 +94,7 @@
|
|||||||
<Panel Name="IndeterminateRoot" Opacity="0">
|
<Panel Name="IndeterminateRoot" Opacity="0">
|
||||||
<Panel.Transitions>
|
<Panel.Transitions>
|
||||||
<Transitions>
|
<Transitions>
|
||||||
<DoubleTransition Property="Opacity" Duration="0:0:0.197" />
|
<DoubleTransition Property="Opacity" Duration="0:0:0.2" />
|
||||||
</Transitions>
|
</Transitions>
|
||||||
</Panel.Transitions>
|
</Panel.Transitions>
|
||||||
<Border
|
<Border
|
||||||
@@ -158,7 +125,7 @@
|
|||||||
<TextBlock.Text>
|
<TextBlock.Text>
|
||||||
<MultiBinding Converter="{StaticResource StringFormatConverter}">
|
<MultiBinding Converter="{StaticResource StringFormatConverter}">
|
||||||
<TemplateBinding Property="ProgressTextFormat" />
|
<TemplateBinding Property="ProgressTextFormat" />
|
||||||
<Binding Path="Value" RelativeSource="{RelativeSource TemplatedParent}" />
|
<TemplateBinding Property="Value" />
|
||||||
<TemplateBinding Property="Percentage" />
|
<TemplateBinding Property="Percentage" />
|
||||||
<TemplateBinding Property="Minimum" />
|
<TemplateBinding Property="Minimum" />
|
||||||
<TemplateBinding Property="Maximum" />
|
<TemplateBinding Property="Maximum" />
|
||||||
@@ -191,149 +158,155 @@
|
|||||||
<Style Selector="^.Error">
|
<Style Selector="^.Error">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
|
<Setter Property="Foreground" Value="{DynamicResource ProgressBarErrorForeground}" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:horizontal /template/ Border#PART_Indicator">
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:vertical /template/ Border#PART_Indicator">
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
|
||||||
<Setter Property="VerticalAlignment" Value="Top" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:horizontal">
|
<Style Selector="^:horizontal">
|
||||||
<Setter Property="MinWidth" Value="200" />
|
<Setter Property="MinWidth" Value="200" />
|
||||||
<Setter Property="MinHeight" Value="4" />
|
<Setter Property="MinHeight" Value="4" />
|
||||||
|
<Style Selector="^ /template/ Border#PART_Indicator">
|
||||||
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator">
|
||||||
|
<Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator2">
|
||||||
|
<Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style Selector="^.Left,^.Top">
|
||||||
|
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
||||||
|
<Setter Property="Grid.Column" Value="0" />
|
||||||
|
<Setter Property="Grid.Row" Value="1" />
|
||||||
|
<Setter Property="Margin" Value="0 0 16 0" />
|
||||||
|
<Setter Property="MinWidth" Value="45" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^ /template/ Border#ProgressBarRoot">
|
||||||
|
<Setter Property="MinHeight" Value="4" />
|
||||||
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
|
</Style>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^.Right,^.Bottom">
|
||||||
|
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
||||||
|
<Setter Property="Grid.Column" Value="2" />
|
||||||
|
<Setter Property="Grid.Row" Value="1" />
|
||||||
|
<Setter Property="Margin" Value="16 0 0 0" />
|
||||||
|
<Setter Property="MinWidth" Value="45" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^ /template/ Border#ProgressBarRoot">
|
||||||
|
<Setter Property="MinHeight" Value="4" />
|
||||||
|
<Setter Property="VerticalAlignment" Value="Center" />
|
||||||
|
</Style>
|
||||||
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style Selector="^:vertical">
|
<Style Selector="^:vertical">
|
||||||
|
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
||||||
|
<Setter Property="LayoutTransform">
|
||||||
|
<RotateTransform Angle="90" />
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
<Setter Property="MinWidth" Value="4" />
|
<Setter Property="MinWidth" Value="4" />
|
||||||
<Setter Property="MinHeight" Value="200" />
|
<Setter Property="MinHeight" Value="200" />
|
||||||
</Style>
|
<Style Selector="^ /template/ Border#PART_Indicator">
|
||||||
<Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
<Setter Property="VerticalAlignment" Value="Top" />
|
||||||
<Setter Property="LayoutTransform">
|
|
||||||
<RotateTransform Angle="90" />
|
|
||||||
</Setter>
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:indeterminate /template/ Panel#DeterminateRoot">
|
|
||||||
<Setter Property="Opacity" Value="0" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:indeterminate /template/ Panel#IndeterminateRoot">
|
|
||||||
<Setter Property="Opacity" Value="1" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
|
|
||||||
<Style.Animations>
|
|
||||||
<Animation IterationCount="Infinite" Duration="0:0:2">
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
|
||||||
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
|
|
||||||
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
|
||||||
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
</Animation>
|
|
||||||
</Style.Animations>
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:horizontal:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
|
|
||||||
<Style.Animations>
|
|
||||||
<Animation IterationCount="Infinite" Duration="0:0:2">
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
|
||||||
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
|
|
||||||
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
|
||||||
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
</Animation>
|
|
||||||
</Style.Animations>
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator">
|
|
||||||
<Style.Animations>
|
|
||||||
<Animation IterationCount="Infinite" Duration="0:0:2">
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
|
||||||
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
|
|
||||||
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
|
||||||
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
</Animation>
|
|
||||||
</Style.Animations>
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:vertical:indeterminate /template/ Border#IndeterminateProgressBarIndicator2">
|
|
||||||
<Style.Animations>
|
|
||||||
<Animation IterationCount="Infinite" Duration="0:0:2">
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
|
||||||
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
|
|
||||||
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
|
||||||
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
|
|
||||||
</KeyFrame>
|
|
||||||
</Animation>
|
|
||||||
</Style.Animations>
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
|
|
||||||
<Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
|
|
||||||
<Setter Property="Width" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
|
|
||||||
<Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
|
|
||||||
<Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
|
|
||||||
</Style>
|
|
||||||
<Style Selector="^.Left">
|
|
||||||
<Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
|
||||||
<Setter Property="Grid.Column" Value="0" />
|
|
||||||
<Setter Property="Grid.Row" Value="1" />
|
|
||||||
<Setter Property="Margin" Value="4 0" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
<Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator">
|
||||||
<Setter Property="Grid.Column" Value="1" />
|
<Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerWidth}" />
|
||||||
<Setter Property="Grid.Row" Value="0" />
|
|
||||||
<Setter Property="Margin" Value="0 4" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
|
<Style Selector="^ /template/ Border#IndeterminateProgressBarIndicator2">
|
||||||
<Setter Property="MinHeight" Value="4" />
|
<Setter Property="Height" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2Width}" />
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:vertical /template/ Border#ProgressBarRoot">
|
<Style Selector="^.Left,^.Top">
|
||||||
<Setter Property="MinWidth" Value="4" />
|
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Setter Property="Grid.Column" Value="1" />
|
||||||
|
<Setter Property="Grid.Row" Value="0" />
|
||||||
|
<Setter Property="Margin" Value="0 0 0 16" />
|
||||||
|
<Setter Property="MinHeight" Value="45" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^ /template/ Border#ProgressBarRoot">
|
||||||
|
<Setter Property="MinWidth" Value="4" />
|
||||||
|
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||||
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^ /template/ TextBlock#PART_ProgressText">
|
<Style Selector="^.Right,^.Bottom">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
|
<Style Selector="^ /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
||||||
|
<Setter Property="Grid.Column" Value="1" />
|
||||||
|
<Setter Property="Grid.Row" Value="2" />
|
||||||
|
<Setter Property="Margin" Value="0 16 0 0" />
|
||||||
|
<Setter Property="MinHeight" Value="45" />
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^ /template/ Border#ProgressBarRoot">
|
||||||
|
<Setter Property="MinWidth" Value="4" />
|
||||||
|
<Setter Property="HorizontalAlignment" Value="Center" />
|
||||||
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^.Right">
|
|
||||||
<Style Selector="^:horizontal /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
<Style Selector="^:indeterminate">
|
||||||
<Setter Property="Grid.Column" Value="2" />
|
<Style Selector="^ /template/ Panel#DeterminateRoot">
|
||||||
<Setter Property="Grid.Row" Value="1" />
|
<Setter Property="Opacity" Value="0" />
|
||||||
<Setter Property="Margin" Value="4 0" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:vertical /template/ LayoutTransformControl#PART_LayoutTransformControl">
|
<Style Selector="^ /template/ Panel#IndeterminateRoot">
|
||||||
<Setter Property="Grid.Column" Value="1" />
|
<Setter Property="Opacity" Value="1" />
|
||||||
<Setter Property="Grid.Row" Value="2" />
|
|
||||||
<Setter Property="Margin" Value="0 4" />
|
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:horizontal /template/ Border#ProgressBarRoot">
|
<Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator">
|
||||||
<Setter Property="MinHeight" Value="4" />
|
<Style.Animations>
|
||||||
<Setter Property="VerticalAlignment" Value="Center" />
|
<Animation IterationCount="Infinite" Duration="0:0:2">
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
||||||
|
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
|
||||||
|
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
||||||
|
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
</Animation>
|
||||||
|
</Style.Animations>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^:vertical /template/ Border#ProgressBarRoot">
|
<Style Selector="^:horizontal /template/ Border#IndeterminateProgressBarIndicator2">
|
||||||
<Setter Property="MinWidth" Value="4" />
|
<Style.Animations>
|
||||||
<Setter Property="HorizontalAlignment" Value="Center" />
|
<Animation IterationCount="Infinite" Duration="0:0:2">
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
||||||
|
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
|
||||||
|
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
||||||
|
<Setter Property="TranslateTransform.X" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
</Animation>
|
||||||
|
</Style.Animations>
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="^ /template/ TextBlock#PART_ProgressText">
|
<Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator">
|
||||||
<Setter Property="Foreground" Value="{DynamicResource ProgressBarOuterTextForeground}" />
|
<Style.Animations>
|
||||||
|
<Animation IterationCount="Infinite" Duration="0:0:2">
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
||||||
|
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationStartPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:1.5">
|
||||||
|
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
||||||
|
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.ContainerAnimationEndPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
</Animation>
|
||||||
|
</Style.Animations>
|
||||||
|
</Style>
|
||||||
|
<Style Selector="^:vertical /template/ Border#IndeterminateProgressBarIndicator2">
|
||||||
|
<Style.Animations>
|
||||||
|
<Animation IterationCount="Infinite" Duration="0:0:2">
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0">
|
||||||
|
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:0.75">
|
||||||
|
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationStartPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
<KeyFrame KeySpline="0.4,0,0.6,1" KeyTime="0:0:2">
|
||||||
|
<Setter Property="TranslateTransform.Y" Value="{Binding $parent[ProgressBar].TemplateSettings.Container2AnimationEndPosition}" />
|
||||||
|
</KeyFrame>
|
||||||
|
</Animation>
|
||||||
|
</Style.Animations>
|
||||||
</Style>
|
</Style>
|
||||||
</Style>
|
</Style>
|
||||||
</ControlTheme>
|
</ControlTheme>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
|
||||||
<Version>12.0.0-nightly-20260210000416</Version>
|
<Version>12.0.0-preview1</Version>
|
||||||
<PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-nightly-20260210000416</PackageReleaseNotes>
|
<PackageReleaseNotes>Update to Semi.Avalonia 12.0.0-preview1</PackageReleaseNotes>
|
||||||
<Title>Semi.Avalonia</Title>
|
<Title>Semi.Avalonia</Title>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
|
<StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
|
||||||
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
|
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
|
||||||
<StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
|
<StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
|
||||||
<StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
|
|
||||||
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
||||||
<StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
|
<StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
|
||||||
<StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
|
<StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
<StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorHighlight" />
|
<StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorHighlight" />
|
||||||
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorHighlightText" />
|
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorHighlightText" />
|
||||||
<StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorWindowText" />
|
<StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorWindowText" />
|
||||||
<StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorWindowText" />
|
|
||||||
<StaticResource x:Key="ProgressBarRootBorderBrush" ResourceKey="SemiColorWindowText" />
|
<StaticResource x:Key="ProgressBarRootBorderBrush" ResourceKey="SemiColorWindowText" />
|
||||||
<StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorHighlight" />
|
<StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorHighlight" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -2,7 +2,6 @@
|
|||||||
<StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
|
<StaticResource x:Key="ProgressBarIndicatorBrush" ResourceKey="SemiColorPrimary" />
|
||||||
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
|
<StaticResource x:Key="ProgressBarBackground" ResourceKey="SemiColorFill0" />
|
||||||
<StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
|
<StaticResource x:Key="ProgressBarTextForeground" ResourceKey="SemiColorText0" />
|
||||||
<StaticResource x:Key="ProgressBarOuterTextForeground" ResourceKey="SemiColorText0" />
|
|
||||||
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
<SolidColorBrush x:Key="ProgressBarRootBorderBrush" Color="Transparent" />
|
||||||
<StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
|
<StaticResource x:Key="ProgressBarPrimaryForeground" ResourceKey="SemiColorPrimary" />
|
||||||
<StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
|
<StaticResource x:Key="ProgressBarSecondaryForeground" ResourceKey="SemiColorSecondary" />
|
||||||
|
|||||||
Reference in New Issue
Block a user
