chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: add avalonia ProgressBar demo.

Browse Source
This commit is contained in:
NaBian committed 2025-01-29 22:33:31 +08:00
1 parent 99c1effd84
commit 1f48e6106d
9 files changed
+818 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml
+100
View File
@@ -0,0 +1,100 @@
<UserControl xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="https://handyorg.github.io/handycontrol"
x:Class="HandyControlDemo.UserControl.NativeProgressBarDemo">
<ScrollViewer>
<hc:UniformSpacingPanel Margin="32"
Spacing="32"
ChildWrapping="Wrap">
<hc:UniformSpacingPanel Spacing="10"
ItemWidth="400"
Orientation="Vertical">
<ProgressBar Value="20"
ShowProgressText="True" />
<ProgressBar Theme="{StaticResource ProgressBarSuccess}"
Value="40"
ShowProgressText="True" />
<ProgressBar Theme="{StaticResource ProgressBarInfo}"
Value="60"
ShowProgressText="True" />
<ProgressBar Theme="{StaticResource ProgressBarWarning}"
Value="80"
ShowProgressText="True" />
<ProgressBar Theme="{StaticResource ProgressBarDanger}"
ShowProgressText="True"
Value="100"
Maximum="200"
IsIndeterminate="True" />
<ProgressBar Theme="{StaticResource ProgressBarPrimaryStripe}"
Value="120"
Maximum="200" />
<ProgressBar Theme="{StaticResource ProgressBarSuccessStripe}"
Value="60"
Maximum="200" />
<ProgressBar Theme="{StaticResource ProgressBarInfoStripe}"
Value="50"
Maximum="200" />
<ProgressBar Theme="{StaticResource ProgressBarWarningStripe}"
Value="180"
Maximum="200" />
<ProgressBar Theme="{StaticResource ProgressBarDangerStripe}"
IsIndeterminate="True"
Maximum="200" />
<ProgressBar Theme="{StaticResource ProgressBarFlat}"
Value="110"
Maximum="200"
IsIndeterminate="True" />
</hc:UniformSpacingPanel>
<hc:UniformSpacingPanel Spacing="10"
ItemHeight="300">
<ProgressBar Value="20"
ShowProgressText="True"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarSuccess}"
Value="40"
ShowProgressText="True"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarInfo}"
Value="60"
ShowProgressText="True"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarWarning}"
Value="80"
ShowProgressText="True"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarDanger}"
Value="100"
Maximum="200"
IsIndeterminate="True"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarPrimaryStripe}"
Value="120"
Maximum="200"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarSuccessStripe}"
Value="60"
Maximum="200"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarInfoStripe}"
Value="50"
Maximum="200"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarWarningStripe}"
Value="180"
Maximum="200"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarDangerStripe}"
IsIndeterminate="True"
Maximum="200"
Orientation="Vertical" />
<ProgressBar Theme="{StaticResource ProgressBarFlat}"
Value="110"
Maximum="200"
IsIndeterminate="True"
Orientation="Vertical" />
</hc:UniformSpacingPanel>
</hc:UniformSpacingPanel>
</ScrollViewer>
</UserControl>
src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml.cs
+10
View File
@@ -0,0 +1,10 @@
namespace HandyControlDemo.UserControl;
public partial class NativeProgressBarDemo : Avalonia.Controls.UserControl
{
public NativeProgressBarDemo()
{
InitializeComponent();
}
}
src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml
+9 -6
View File
@@ -1,11 +1,14 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converter="clr-namespace:HandyControl.Tools.Converter">
xmlns:hc="clr-namespace:HandyControl.Tools.Converter"
xmlns:avalonia="using:Avalonia.Controls.Converters">
<converter:BorderClipConverter x:Key="BorderClipConverter" />
<converter:BorderCircularConverter x:Key="BorderCircularConverter" />
<converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter" />
<converter:GeometrySpacingConverter x:Key="GeometrySpacingConverter" />
<converter:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter" />
<hc:BorderClipConverter x:Key="BorderClipConverter" />
<hc:BorderCircularConverter x:Key="BorderCircularConverter" />
<hc:BorderCircularClipConverter x:Key="BorderCircularClipConverter" />
<hc:GeometrySpacingConverter x:Key="GeometrySpacingConverter" />
<hc:CornerRadiusSplitConverter x:Key="CornerRadiusSplitConverter" />
<hc:DoubleExpandConverter x:Key="DoubleExpandConverter" />
<avalonia:StringFormatConverter x:Key="StringFormatConverter" />
</ResourceDictionary>
src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml
+657
View File
@@ -0,0 +1,657 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:hc="clr-namespace:HandyControl.Controls">
<ControlTheme x:Key="ProgressBarBaseStyle"
TargetType="ProgressBar">
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="Background"
Value="{DynamicResource SecondaryRegionBrush}" />
<Setter Property="BorderBrush"
Value="{DynamicResource BorderBrush}" />
<Setter Property="BorderThickness"
Value="0" />
<Setter Property="Template">
<ControlTemplate>
<Border Theme="{StaticResource BorderClip}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}">
<Panel>
<LayoutTransformControl HorizontalAlignment="Center"
VerticalAlignment="Center">
<LayoutTransformControl.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="ShowProgressText"
RelativeSource="{RelativeSource TemplatedParent}" />
<Binding Path="!IsIndeterminate"
RelativeSource="{RelativeSource TemplatedParent}" />
</MultiBinding>
</LayoutTransformControl.IsVisible>
<TextBlock x:Name="textBlock"
Foreground="{TemplateBinding Foreground}">
<TextBlock.Text>
<MultiBinding Converter="{StaticResource StringFormatConverter}">
<TemplateBinding Property="ProgressTextFormat" />
<Binding Path="Value"
RelativeSource="{RelativeSource TemplatedParent}" />
<TemplateBinding Property="Percentage" />
<TemplateBinding Property="Minimum" />
<TemplateBinding Property="Maximum" />
</MultiBinding>
</TextBlock.Text>
</TextBlock>
</LayoutTransformControl>
<Border Name="PART_Indicator"
Theme="{StaticResource BorderClip}"
Background="{TemplateBinding Foreground}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}">
<Border x:Name="BorderClip"
Width="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
Height="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}}">
<LayoutTransformControl HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock Foreground="{DynamicResource TextIconBrush}"
Text="{Binding Text, ElementName=textBlock}" />
</LayoutTransformControl>
</Border>
</Border>
<Border Name="PART_IndeterminateIndicator"
Background="{TemplateBinding Foreground}"
IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
</Panel>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:horizontal">
<Setter Property="MinHeight"
Value="20" />
<Style Selector="^ /template/ Border#PART_Indicator">
<Setter Property="HorizontalAlignment"
Value="Left" />
<Setter Property="VerticalAlignment"
Value="Stretch" />
</Style>
<Style Selector="^ /template/ Border#BorderClip">
<Setter Property="HorizontalAlignment"
Value="Left" />
<Setter Property="VerticalAlignment"
Value="Stretch" />
</Style>
<Style Selector="^:indeterminate /template/ Border#PART_IndeterminateIndicator">
<Style.Animations>
<Animation Easing="LinearEasing"
IterationCount="Infinite"
Duration="0:0:2">
<KeyFrame Cue="0%">
<Setter Property="TranslateTransform.X"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateStartingOffset}" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="TranslateTransform.X"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateEndingOffset}" />
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="Width"
Value="{Binding TemplateSettings.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
</Style>
</Style>
<Style Selector="^:vertical">
<Setter Property="MinWidth"
Value="20" />
<Style Selector="^ /template/ Border#PART_Indicator">
<Setter Property="HorizontalAlignment"
Value="Stretch" />
<Setter Property="VerticalAlignment"
Value="Bottom" />
</Style>
<Style Selector="^ /template/ LayoutTransformControl">
<Setter Property="LayoutTransform">
<Setter.Value>
<RotateTransform Angle="-90" />
</Setter.Value>
</Setter>
</Style>
<Style Selector="^ /template/ Border#BorderClip">
<Setter Property="HorizontalAlignment"
Value="Stretch" />
<Setter Property="VerticalAlignment"
Value="Bottom" />
</Style>
<Style Selector="^:indeterminate /template/ Border#PART_IndeterminateIndicator">
<Style.Animations>
<Animation Easing="LinearEasing"
IterationCount="Infinite"
Duration="0:0:2">
<KeyFrame Cue="100%">
<Setter Property="TranslateTransform.Y"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateStartingOffset}" />
</KeyFrame>
<KeyFrame Cue="0%">
<Setter Property="TranslateTransform.Y"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateEndingOffset}" />
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="Height"
Value="{Binding TemplateSettings.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
</Style>
</Style>
</ControlTheme>
<ControlTheme x:Key="{x:Type ProgressBar}"
BasedOn="{StaticResource ProgressBarBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground"
Value="{DynamicResource PrimaryBrush}" />
</ControlTheme>
<ControlTheme x:Key="ProgressBarSuccess"
BasedOn="{StaticResource ProgressBarBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground"
Value="{DynamicResource SuccessBrush}" />
</ControlTheme>
<ControlTheme x:Key="ProgressBarInfo"
BasedOn="{StaticResource ProgressBarBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground"
Value="{DynamicResource InfoBrush}" />
</ControlTheme>
<ControlTheme x:Key="ProgressBarWarning"
BasedOn="{StaticResource ProgressBarBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground"
Value="{DynamicResource WarningBrush}" />
</ControlTheme>
<ControlTheme x:Key="ProgressBarDanger"
BasedOn="{StaticResource ProgressBarBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground"
Value="{DynamicResource DangerBrush}" />
</ControlTheme>
<ControlTheme x:Key="ProgressBarStripeBaseStyle"
TargetType="ProgressBar">
<Setter Property="hc:BorderElement.CornerRadius"
Value="{StaticResource DefaultCornerRadius}" />
<Setter Property="Background"
Value="{DynamicResource SecondaryRegionBrush}" />
<Setter Property="BorderBrush"
Value="{DynamicResource BorderBrush}" />
<Setter Property="BorderThickness"
Value="0" />
<Setter Property="Template">
<ControlTemplate>
<Border Theme="{StaticResource BorderClip}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}">
<Panel>
<Border x:Name="PART_Indicator"
Theme="{StaticResource BorderClip}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}">
<Border x:Name="BorderStripe"
Background="{TemplateBinding Foreground}" />
</Border>
<Border x:Name="PART_IndeterminateIndicator"
Background="{TemplateBinding Foreground}"
IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
</Panel>
</Border>
</ControlTemplate>
</Setter>
<Style Selector="^:horizontal">
<Setter Property="MinHeight"
Value="20" />
<Style Selector="^ /template/ Border#PART_Indicator">
<Setter Property="HorizontalAlignment"
Value="Left" />
<Setter Property="VerticalAlignment"
Value="Stretch" />
</Style>
<Style Selector="^ /template/ Border#BorderStripe, ^ /template/ Border#PART_IndeterminateIndicator">
<Style.Animations>
<Animation Easing="LinearEasing"
IterationCount="Infinite"
Duration="0:0:.5">
<KeyFrame Cue="0%">
<Setter Property="TranslateTransform.X"
Value="-21" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="TranslateTransform.X"
Value="21" />
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="Width"
Value="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoubleExpandConverter}, ConverterParameter=40}" />
<Setter Property="Height"
Value="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}}" />
</Style>
</Style>
<Style Selector="^:vertical">
<Setter Property="MinWidth"
Value="20" />
<Style Selector="^ /template/ Border#PART_Indicator">
<Setter Property="HorizontalAlignment"
Value="Stretch" />
<Setter Property="VerticalAlignment"
Value="Bottom" />
</Style>
<Style Selector="^ /template/ Border#BorderStripe, ^ /template/ Border#PART_IndeterminateIndicator">
<Style.Animations>
<Animation Easing="LinearEasing"
IterationCount="Infinite"
Duration="0:0:.5">
<KeyFrame Cue="100%">
<Setter Property="TranslateTransform.Y"
Value="-21" />
</KeyFrame>
<KeyFrame Cue="0%">
<Setter Property="TranslateTransform.Y"
Value="21" />
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="Width"
Value="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" />
<Setter Property="Height"
Value="{Binding Bounds.Height, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource DoubleExpandConverter}, ConverterParameter=40}" />
</Style>
</Style>
</ControlTheme>
<LinearGradientBrush x:Key="PrimaryStripeBrush"
EndPoint="100%,0%"
StartPoint="0%,0%">
<GradientStop Color="{StaticResource DarkPrimaryColor}"
Offset="0" />
<GradientStop Color="{StaticResource DarkPrimaryColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="1" />
</LinearGradientBrush>
<ControlTheme x:Key="ProgressBarPrimaryStripe"
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground">
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="20" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource PrimaryStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
<Setter Property="Background">
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="110" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource PrimaryStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter>
</Style>
</ControlTheme>
<LinearGradientBrush x:Key="SuccessStripeBrush"
EndPoint="100%,0%"
StartPoint="0%,0%">
<GradientStop Color="{StaticResource DarkSuccessColor}"
Offset="0" />
<GradientStop Color="{StaticResource DarkSuccessColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="1" />
</LinearGradientBrush>
<ControlTheme x:Key="ProgressBarSuccessStripe"
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground">
<Setter.Value>
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="20" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter.Value>
</Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
<Setter Property="Background">
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="110" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource SuccessStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter>
</Style>
</ControlTheme>
<LinearGradientBrush x:Key="InfoStripeBrush"
EndPoint="100%,0%"
StartPoint="0%,0%">
<GradientStop Color="{StaticResource DarkInfoColor}"
Offset="0" />
<GradientStop Color="{StaticResource DarkInfoColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="1" />
</LinearGradientBrush>
<ControlTheme x:Key="ProgressBarInfoStripe"
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground">
<Setter.Value>
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="20" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter.Value>
</Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
<Setter Property="Background">
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="110" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource InfoStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter>
</Style>
</ControlTheme>
<LinearGradientBrush x:Key="WarningStripeBrush"
EndPoint="100%,0%"
StartPoint="0%,0%">
<GradientStop Color="{StaticResource DarkWarningColor}"
Offset="0" />
<GradientStop Color="{StaticResource DarkWarningColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="1" />
</LinearGradientBrush>
<ControlTheme x:Key="ProgressBarWarningStripe"
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground">
<Setter.Value>
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="20" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter.Value>
</Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
<Setter Property="Background">
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="110" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource WarningStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter>
</Style>
</ControlTheme>
<LinearGradientBrush x:Key="DangerStripeBrush"
EndPoint="100%,0%"
StartPoint="0%,0%">
<GradientStop Color="{StaticResource DarkDangerColor}"
Offset="0" />
<GradientStop Color="{StaticResource DarkDangerColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="0.5" />
<GradientStop Color="{StaticResource BackgroundColor}"
Offset="1" />
</LinearGradientBrush>
<ControlTheme x:Key="ProgressBarDangerStripe"
BasedOn="{StaticResource ProgressBarStripeBaseStyle}"
TargetType="ProgressBar">
<Setter Property="Foreground">
<Setter.Value>
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="20" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter.Value>
</Setter>
<Style Selector="^:vertical /template/ Border#BorderStripe, ^:vertical /template/ Border#PART_IndeterminateIndicator">
<Setter Property="Background">
<DrawingBrush TileMode="Tile"
SourceRect="0,0,20,32"
DestinationRect="0,0,20,32"
Stretch="None">
<DrawingBrush.Transform>
<RotateTransform Angle="110" />
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
<GeometryDrawing Brush="{StaticResource DangerStripeBrush}">
<GeometryDrawing.Geometry>
<RectangleGeometry Rect="0,0,20,32" />
</GeometryDrawing.Geometry>
</GeometryDrawing>
</DrawingBrush.Drawing>
</DrawingBrush>
</Setter>
</Style>
</ControlTheme>
<ControlTheme x:Key="ProgressBarFlat"
TargetType="ProgressBar">
<Setter Property="Background"
Value="{DynamicResource SecondaryRegionBrush}" />
<Setter Property="Foreground"
Value="{DynamicResource PrimaryBrush}" />
<Setter Property="Template">
<ControlTemplate>
<Panel Background="{TemplateBinding Background}">
<Border Name="PART_Indicator"
Theme="{StaticResource BorderClip}"
Background="{TemplateBinding Foreground}"
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}"
IsVisible="{Binding !IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
<Border Name="PART_IndeterminateIndicator"
Background="{TemplateBinding Foreground}"
IsVisible="{Binding IsIndeterminate, RelativeSource={RelativeSource TemplatedParent}}" />
</Panel>
</ControlTemplate>
</Setter>
<Style Selector="^:horizontal">
<Setter Property="MinHeight"
Value="4" />
<Style Selector="^ /template/ Border#PART_Indicator">
<Setter Property="HorizontalAlignment"
Value="Left" />
<Setter Property="VerticalAlignment"
Value="Stretch" />
</Style>
<Style Selector="^:indeterminate /template/ Border#PART_IndeterminateIndicator">
<Style.Animations>
<Animation Easing="LinearEasing"
IterationCount="Infinite"
Duration="0:0:2">
<KeyFrame Cue="0%">
<Setter Property="TranslateTransform.X"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateStartingOffset}" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="TranslateTransform.X"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateEndingOffset}" />
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="Width"
Value="{Binding TemplateSettings.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
</Style>
</Style>
<Style Selector="^:vertical">
<Setter Property="MinWidth"
Value="4" />
<Style Selector="^ /template/ Border#PART_Indicator">
<Setter Property="HorizontalAlignment"
Value="Stretch" />
<Setter Property="VerticalAlignment"
Value="Bottom" />
</Style>
<Style Selector="^:indeterminate /template/ Border#PART_IndeterminateIndicator">
<Style.Animations>
<Animation Easing="LinearEasing"
IterationCount="Infinite"
Duration="0:0:2">
<KeyFrame Cue="100%">
<Setter Property="TranslateTransform.Y"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateStartingOffset}" />
</KeyFrame>
<KeyFrame Cue="0%">
<Setter Property="TranslateTransform.Y"
Value="{Binding $parent[ProgressBar].TemplateSettings.IndeterminateEndingOffset}" />
</KeyFrame>
</Animation>
</Style.Animations>
<Setter Property="Height"
Value="{Binding TemplateSettings.ContainerWidth, RelativeSource={RelativeSource TemplatedParent}}" />
</Style>
</Style>
</ControlTheme>
</ResourceDictionary>
src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml
+1
View File
@@ -34,6 +34,7 @@
<MergeResourceInclude Source="/Themes/Styles/Label.axaml" />
<MergeResourceInclude Source="/Themes/Styles/Slider.axaml" />
<MergeResourceInclude Source="/Themes/Styles/Expander.axaml" />
<MergeResourceInclude Source="/Themes/Styles/ProgressBar.axaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Styles.Resources>
src/Avalonia/HandyControl_Avalonia/Tools/Converter/DoubleExpandConverter.cs
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.Globalization;
using Avalonia.Data.Converters;
namespace HandyControl.Tools.Converter;
internal class DoubleExpandConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
if (value is not double originalValue)
{
return value;
}
if (!double.TryParse(parameter as string, out double expandValue))
{
return value;
}
return originalValue + expandValue;
}
public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture) =>
throw new NotImplementedException();
}
src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+5 -5
View File
@@ -4384,7 +4384,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4413,7 +4413,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4442,7 +4442,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4471,7 +4471,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4500,7 +4500,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml
+5 -5
View File
@@ -30,7 +30,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20"/>
<TranslateTransform x:Name="MyTransform" X="0"/>
<TranslateTransform X="0"/>
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -60,7 +60,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20"/>
<TranslateTransform x:Name="MyTransform" X="0"/>
<TranslateTransform X="0"/>
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -90,7 +90,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20"/>
<TranslateTransform x:Name="MyTransform" X="0"/>
<TranslateTransform X="0"/>
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -120,7 +120,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20"/>
<TranslateTransform x:Name="MyTransform" X="0"/>
<TranslateTransform X="0"/>
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -150,7 +150,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20"/>
<TranslateTransform x:Name="MyTransform" X="0"/>
<TranslateTransform X="0"/>
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
src/Shared/HandyControl_Shared/Themes/Theme.xaml
+5 -5
View File
@@ -4384,7 +4384,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4413,7 +4413,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4442,7 +4442,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4471,7 +4471,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>
@@ -4500,7 +4500,7 @@
<DrawingBrush.Transform>
<TransformGroup>
<RotateTransform Angle="20" />
<TranslateTransform x:Name="MyTransform" X="0" />
<TranslateTransform X="0" />
</TransformGroup>
</DrawingBrush.Transform>
<DrawingBrush.Drawing>