From 95f5790bb78275caf0ec88408f02e636706077ee Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@CLLVBJYM2CVKF45>
Date: Thu, 27 Jun 2019 15:00:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?ProgressBar=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E6=96=87=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();
+        }
+    }
+}

From d8e8c68bb0ff3aa9a93983cda2dfb8c5af6f761c Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Thu, 27 Jun 2019 23:57:48 +0800
Subject: [PATCH 2/2] updated the branch

---
 .../Controls/Attach/VisualElement.cs          | 11 +++++-
 .../HandyControl_Shared.projitems             |  1 -
 .../Styles/Base/ProgressBarBaseStyle.xaml     | 17 +++++++--
 .../Tools/Converter/NameReferenceConverter.cs | 17 ---------
 .../Converter/Number2PercentageConverter.cs   | 36 +++++++++++--------
 5 files changed, 46 insertions(+), 36 deletions(-)
 delete mode 100644 src/Shared/HandyControl_Shared/Tools/Converter/NameReferenceConverter.cs

diff --git a/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
index 2e748dae..1a39fbde 100644
--- a/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
+++ b/src/Shared/HandyControl_Shared/Controls/Attach/VisualElement.cs
@@ -12,6 +12,15 @@ namespace HandyControl.Controls
             => element.SetValue(HighlightBrushProperty, value);
 
         public static Brush GetHighlightBrush(DependencyObject element)
-            => (Brush) element.GetValue(HighlightBrushProperty);        
+            => (Brush) element.GetValue(HighlightBrushProperty);
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.RegisterAttached(
+            "Text", typeof(string), typeof(VisualElement), new PropertyMetadata(default(string)));
+
+        public static void SetText(DependencyObject element, string value)
+            => element.SetValue(TextProperty, value);
+
+        public static string GetText(DependencyObject element)
+            => (string) element.GetValue(TextProperty);
     }
 }
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
index ce4c4233..91dcd613 100644
--- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
+++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems
@@ -25,7 +25,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Slider\RangeSlider\TwoWayRangeBase.cs" />
     <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" />
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
index 78d1a69f..2a33fef1 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ProgressBarBaseStyle.xaml
@@ -16,6 +16,14 @@
     </LinearGradientBrush>
 
     <Style x:Key="ProgressBarBaseStyle" TargetType="ProgressBar">
+        <Setter Property="controls:VisualElement.Text">
+            <Setter.Value>
+                <MultiBinding Converter="{StaticResource Number2PercentageConverter}" StringFormat="{}{0} %">
+                    <Binding Path="Value" RelativeSource="{RelativeSource Self}"/>
+                    <Binding Path="Maximum" RelativeSource="{RelativeSource Self}"/>
+                </MultiBinding>
+            </Setter.Value>
+        </Setter>
         <Setter Property="Height" Value="20"/>
         <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
         <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
@@ -33,7 +41,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 Converter={StaticResource Number2PercentageConverter},RelativeSource={RelativeSource TemplatedParent},StringFormat={}{0} %}"/>
+                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource TextIconBrush}" Text="{Binding Path=(controls:VisualElement.Text),RelativeSource={RelativeSource TemplatedParent}}"/>
                         </controls:SimplePanel>
                     </controls:SimplePanel>
                 </ControlTemplate>
@@ -41,7 +49,12 @@
         </Setter>
     </Style>
 
-    <Style x:Key="ProgressBarStripeBaseStyle" BasedOn="{StaticResource ProgressBarBaseStyle}" TargetType="ProgressBar">
+    <Style x:Key="ProgressBarStripeBaseStyle" TargetType="ProgressBar">
+        <Setter Property="Height" Value="20"/>
+        <Setter Property="controls:BorderElement.CornerRadius" Value="4"/>
+        <Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ProgressBar">
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/NameReferenceConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/NameReferenceConverter.cs
deleted file mode 100644
index 29a6924c..00000000
--- a/src/Shared/HandyControl_Shared/Tools/Converter/NameReferenceConverter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-// ReSharper disable ConditionIsAlwaysTrueOrFalse
-// ReSharper disable HeuristicUnreachableCode
-
-namespace HandyControl.Tools.Converter
-{
-    public class NameReferenceConverter : System.Windows.Markup.NameReferenceConverter
-    {
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) 
-            => context == null ? null : base.ConvertFrom(context, culture, value);
-
-        public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
-            => context == null ? null : base.ConvertTo(context, culture, value, destinationType);
-    }
-}
\ No newline at end of file
diff --git a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
index 79bfcc94..08ebef73 100644
--- a/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
+++ b/src/Shared/HandyControl_Shared/Tools/Converter/Number2PercentageConverter.cs
@@ -1,28 +1,34 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using System.Windows.Controls;
 using System.Windows.Data;
+using HandyControl.Expression.Drawing;
+using HandyControl.Tools.Extension;
 
 namespace HandyControl.Tools.Converter
 {
-    public class Number2PercentageConverter : IValueConverter
+    public class Number2PercentageConverter : IMultiValueConverter
     {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        public object Convert(object[] values, 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;
+            if (values == null || values.Length != 2) return .0;
+
+            var obj1 = values[0];
+            var obj2 = values[1];
+
+            if (obj1 == null || obj2 == null) return .0;
+
+            var str1 = values[0].ToString();
+            var str2 = values[1].ToString();
+
+            var v1 = str1.Value<double>();
+            var v2 = str2.Value<double>();
+
+            if (MathHelper.IsVerySmall(v2)) return 100.0;
+
+            return v1 / v2 * 100;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
         {
             throw new NotImplementedException();
         }