Merge pull request #1 from windows-toolkit/master

Merge from master repo
vgromfeld · Mar 13, 2020 · 7fc6df7 · 7fc6df7
2 parents ef65272 + afed92f
commit 7fc6df7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RadialGauge/RadialGaugeCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RadialGauge/RadialGaugeCode.bind
@@ -26,6 +26,7 @@
                   MinAngle="@[MinAngle:Slider:210:0-360]"
                   MaxAngle="@[MaxAngle:Slider:150:0-360]"
                   Unit="units"
+                  ValueStringFormat="@[ValueStringFormat:String:N0]"
                   NeedleWidth="@[NeedleWidth:Slider:4:1-10]"
                   NeedleLength="@[NeedleLength:Slider:100:20-100]" 
                   TickLength="@[TickLength:Slider:10:0-30]"

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs
@@ -88,7 +88,7 @@ public class RadialGauge : RangeBase
         /// Identifies the ValueStringFormat dependency property.
         /// </summary>
         public static readonly DependencyProperty ValueStringFormatProperty =
-            DependencyProperty.Register(nameof(ValueStringFormat), typeof(string), typeof(RadialGauge), new PropertyMetadata("N0"));
+            DependencyProperty.Register(nameof(ValueStringFormat), typeof(string), typeof(RadialGauge), new PropertyMetadata("N0", (s, e) => OnValueChanged(s)));
 
         /// <summary>
         /// Identifies the TickSpacing dependency property.

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml
@@ -108,7 +108,6 @@
                                            FontSize="20"
                                            FontWeight="SemiBold"
                                            Foreground="{TemplateBinding Foreground}"
-                                           Text="{TemplateBinding Value}"
                                            TextAlignment="Center" />
                                 <TextBlock Margin="0"
                                            FontSize="16"

diff --git a/Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs b/Microsoft.Toolkit.Uwp/Deferred/EventHandlerExtensions.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -16,8 +14,6 @@ namespace Microsoft.Toolkit.Uwp.Deferred
     /// </summary>
     public static class EventHandlerExtensions
     {
-        private static readonly Task CompletedTask = Task.FromResult(0);
-
         /// <summary>
         /// Use to invoke an async <see cref="EventHandler{TEventArgs}"/> using <see cref="DeferredEventArgs"/>.
         /// </summary>
@@ -46,7 +42,7 @@ public static Task InvokeAsync<T>(this EventHandler<T> eventHandler, object send
         {
             if (eventHandler == null)
             {
-                return CompletedTask;
+                return Task.CompletedTask;
             }
 
             var tasks = eventHandler.GetInvocationList()
@@ -59,7 +55,7 @@ public static Task InvokeAsync<T>(this EventHandler<T> eventHandler, object send
 
                     var deferral = eventArgs.GetCurrentDeferralAndReset();
 
-                    return deferral?.WaitForCompletion(cancellationToken) ?? CompletedTask;
+                    return deferral?.WaitForCompletion(cancellationToken) ?? Task.CompletedTask;
                 })
                 .ToArray();
 

diff --git a/Microsoft.Toolkit.Uwp/Deferred/TypedEventHandlerExtensions.cs b/Microsoft.Toolkit.Uwp/Deferred/TypedEventHandlerExtensions.cs
@@ -15,8 +15,6 @@ namespace Microsoft.Toolkit.Uwp.Deferred
     /// </summary>
     public static class TypedEventHandlerExtensions
     {
-        private static readonly Task CompletedTask = Task.FromResult(0);
-
         /// <summary>
         /// Use to invoke an async <see cref="TypedEventHandler{TSender, TResult}"/> using <see cref="DeferredEventArgs"/>.
         /// </summary>
@@ -47,7 +45,7 @@ public static Task InvokeAsync<S, R>(this TypedEventHandler<S, R> eventHandler,
         {
             if (eventHandler == null)
             {
-                return CompletedTask;
+                return Task.CompletedTask;
             }
 
             var tasks = eventHandler.GetInvocationList()
@@ -60,7 +58,7 @@ public static Task InvokeAsync<S, R>(this TypedEventHandler<S, R> eventHandler,
 
                     var deferral = eventArgs.GetCurrentDeferralAndReset();
 
-                    return deferral?.WaitForCompletion(cancellationToken) ?? CompletedTask;
+                    return deferral?.WaitForCompletion(cancellationToken) ?? Task.CompletedTask;
                 })
                 .ToArray();