From 95f5790bb78275caf0ec88408f02e636706077ee Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@CLLVBJYM2CVKF45>
Date: Thu, 27 Jun 2019 15:00:06 +0800
Subject: [PATCH] =?UTF-8?q?ProgressBar=E7=99=BE=E5=88=86=E6=AF=94=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HandyControl_Shared.projitems             |  1 +
 .../Themes/Basic/Converters.xaml              |  2 +-
 .../Styles/Base/ProgressBarBaseStyle.xaml     |  2 +-
 .../Converter/Number2PercentageConverter.cs   | 30 +++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs

diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index b054d4ba..ce4c4233 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -26,6 +26,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Interactivity\Commands\OpenLinkCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\BorderCircularClipConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\NameReferenceConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Tools\Converter\Number2PercentageConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\FrameworkElementExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\Extension\StringExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Tools\GlobalShortcut.cs" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
index 1cbb0d12..f59dcea9 100644
--- a/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Basic/Converters.xaml
@@ -18,5 +18,5 @@
     <converter:BorderCircularClipConverter x:Key="BorderCircularClipConverter"/>
     <converter:BorderCircularConverter x:Key="BorderCircularConverter"/>
     <converter:Object2VisibilityConverter x:Key="Object2VisibilityConverter"/>
-
+    <converter:Number2PercentageConverter x:Key="Number2PercentageConverter"/>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index 06e3c936..78d1a69f 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -33,7 +33,7 @@
                                     <Rectangle x:Name="PART_GlowRect" Fill="{StaticResource ProgressBarIndicatorAnimatedFill}" HorizontalAlignment="Left" Margin="-100,0,0,0" Width="100"/>
                                 </Border>
                             </Decorator>
-                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Value,RelativeSource={RelativeSource TemplatedParent},StringFormat={}{0} %}"/>
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Converter={StaticResource Number2PercentageConverter},RelativeSource={RelativeSource TemplatedParent},StringFormat={}{0} %}"/>
                         </controls:SimplePanel>
                     </controls:SimplePanel>
                 </ControlTemplate>
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
new file mode 100644
index 00000000..79bfcc94
--- /dev/null
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace HandyControl.Tools.Converter
+{
+    public class Number2PercentageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            string result = "";
+            if (value is ProgressBar element)
+            {
+                double result_double = element.Value * 100 / element.Maximum;
+                int result_int = (int)result_double;
+                if (result_double - result_int > 0) result = (element.Value * 100 / element.Maximum).ToString("f1");
+                else result = result_int.ToString();
+            }
+            return result;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}