diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml new file mode 100644 index 000000000..446e9fcd2 --- /dev/null +++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml.cs b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml.cs new file mode 100644 index 000000000..a507ed070 --- /dev/null +++ b/src/Avalonia/HandyControlDemo_Avalonia/UserControl/Styles/NativeProgressBarDemo.axaml.cs @@ -0,0 +1,10 @@ +namespace HandyControlDemo.UserControl; + +public partial class NativeProgressBarDemo : Avalonia.Controls.UserControl +{ + public NativeProgressBarDemo() + { + InitializeComponent(); + } +} + diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml index f2a7c3339..b7982b9f1 100644 --- a/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml +++ b/src/Avalonia/HandyControl_Avalonia/Themes/Basic/Converters.axaml @@ -1,11 +1,14 @@  + xmlns:hc="clr-namespace:HandyControl.Tools.Converter" + xmlns:avalonia="using:Avalonia.Controls.Converters"> - - - - - + + + + + + + diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml new file mode 100644 index 000000000..e33489065 --- /dev/null +++ b/src/Avalonia/HandyControl_Avalonia/Themes/Styles/ProgressBar.axaml @@ -0,0 +1,657 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml b/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml index 02ebeef90..9af82cabe 100644 --- a/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml +++ b/src/Avalonia/HandyControl_Avalonia/Themes/Theme.axaml @@ -34,6 +34,7 @@ + diff --git a/src/Avalonia/HandyControl_Avalonia/Tools/Converter/DoubleExpandConverter.cs b/src/Avalonia/HandyControl_Avalonia/Tools/Converter/DoubleExpandConverter.cs new file mode 100644 index 000000000..89eb2dcd3 --- /dev/null +++ b/src/Avalonia/HandyControl_Avalonia/Tools/Converter/DoubleExpandConverter.cs @@ -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(); +} diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml index 39791ba9a..a9b6d266f 100644 --- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml +++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml @@ -4384,7 +4384,7 @@ - + @@ -4413,7 +4413,7 @@ - + @@ -4442,7 +4442,7 @@ - + @@ -4471,7 +4471,7 @@ - + @@ -4500,7 +4500,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml index 2c247cfe9..ca01d47d3 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/ProgressBar.xaml @@ -30,7 +30,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml index 0b0869b7d..7c88ebf59 100644 --- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml @@ -4384,7 +4384,7 @@ - + @@ -4413,7 +4413,7 @@ - + @@ -4442,7 +4442,7 @@ - + @@ -4471,7 +4471,7 @@ - + @@ -4500,7 +4500,7 @@ - +