From 093c4f5af5cc62ff8d4f904395cf593fada036e9 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Tue, 8 Dec 2020 15:18:21 -0500
Subject: [PATCH 1/4] Remove animations from RangeSelector

---
 .../RangeSelector/RangeSelector.xaml              | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml
index 1aa6a1911e7..96c03241032 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml
@@ -1,6 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
                     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
 
     <Style x:Key="SliderThumbStyle"
@@ -58,20 +57,6 @@
                                   BorderBrush="{ThemeResource SystemControlForegroundChromeHighBrush}"
                                   BorderThickness="1"
                                   Visibility="Collapsed">
-                                <animations:Implicit.ShowAnimations>
-                                    <animations:OpacityAnimation From="0"
-                                                                 To="1.0"
-                                                                 Duration="0:0:0.3" />
-                                </animations:Implicit.ShowAnimations>
-
-                                <animations:Implicit.HideAnimations>
-                                    <animations:ScalarAnimation Target="Opacity"
-                                                                To="0"
-                                                                Duration="0:0:1">
-                                        <animations:ScalarKeyFrame Key="0.7"
-                                                                   Value="1.0" />
-                                    </animations:ScalarAnimation>
-                                </animations:Implicit.HideAnimations>
                                 <TextBlock x:Name="ToolTipText"
                                            Margin="8"
                                            Foreground="{ThemeResource SystemControlForegroundBaseHighBrush}" />

From b02014332a7b82f5876776d77bfa67c137420664 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 9 Dec 2020 15:03:40 -0500
Subject: [PATCH 2/4] Use debounce helper to keep tooltip from disappearing to
 quickly

---
 .../RangeSelector/RangeSelector.cs                        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
index 419a68efd8a..0d86f1537e3 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using Microsoft.Toolkit.Uwp.UI.Extensions;
 using Windows.Foundation;
 using Windows.System;
 using Windows.UI.Xaml;
@@ -35,6 +36,7 @@ public partial class RangeSelector : Control
         private const double DefaultMinimum = 0.0;
         private const double DefaultMaximum = 1.0;
         private const double DefaultStepFrequency = 1;
+        private static readonly TimeSpan TimeToHideToolTipOnKeyUp = TimeSpan.FromSeconds(1);
 
         /// <summary>
         /// Identifies the Minimum dependency property.
@@ -61,6 +63,8 @@ public partial class RangeSelector : Control
         /// </summary>
         public static readonly DependencyProperty StepFrequencyProperty = DependencyProperty.Register(nameof(StepFrequency), typeof(double), typeof(RangeSelector), new PropertyMetadata(DefaultStepFrequency));
 
+        private readonly DispatcherTimer dispatcherTimer = new DispatcherTimer();
+
         private Border _outOfRangeContentContainer;
         private Rectangle _activeRectangle;
         private Thumb _minThumb;
@@ -247,7 +251,9 @@ private void Thumb_KeyUp(object sender, KeyRoutedEventArgs e)
                 case VirtualKey.Right:
                     if (_toolTip != null)
                     {
-                        _toolTip.Visibility = Visibility.Collapsed;
+                        dispatcherTimer.Debounce(
+                            () => _toolTip.Visibility = Visibility.Collapsed,
+                            TimeToHideToolTipOnKeyUp);
                     }
 
                     e.Handled = true;

From bb5d39d0f6bec6aa2c20401eeb97c60657766646 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 10 Dec 2020 11:25:59 -0500
Subject: [PATCH 3/4] rename dispatch timer

---
 .../RangeSelector/RangeSelector.cs                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
index 0d86f1537e3..a4d78a5606a 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
@@ -63,7 +63,7 @@ public partial class RangeSelector : Control
         /// </summary>
         public static readonly DependencyProperty StepFrequencyProperty = DependencyProperty.Register(nameof(StepFrequency), typeof(double), typeof(RangeSelector), new PropertyMetadata(DefaultStepFrequency));
 
-        private readonly DispatcherTimer dispatcherTimer = new DispatcherTimer();
+        private readonly DispatcherTimer keyDebounceTimer = new DispatcherTimer();
 
         private Border _outOfRangeContentContainer;
         private Rectangle _activeRectangle;
@@ -251,7 +251,7 @@ private void Thumb_KeyUp(object sender, KeyRoutedEventArgs e)
                 case VirtualKey.Right:
                     if (_toolTip != null)
                     {
-                        dispatcherTimer.Debounce(
+                        keyDebounceTimer.Debounce(
                             () => _toolTip.Visibility = Visibility.Collapsed,
                             TimeToHideToolTipOnKeyUp);
                     }

From ddd80772baef00e6979d07a5080ac5ff87f37cf6 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Thu, 10 Dec 2020 12:01:50 -0500
Subject: [PATCH 4/4] Change debounc extention to use DispatherQueueTimer

---
 .../RangeSelector/RangeSelector.cs               |  2 +-
 ...ions.cs => DispatcherQueueTimerExtensions.cs} | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename Microsoft.Toolkit.Uwp.UI/Extensions/{DispatcherTimerExtensions.cs => DispatcherQueueTimerExtensions.cs} (85%)

diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
index a4d78a5606a..373db695187 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs
@@ -63,7 +63,7 @@ public partial class RangeSelector : Control
         /// </summary>
         public static readonly DependencyProperty StepFrequencyProperty = DependencyProperty.Register(nameof(StepFrequency), typeof(double), typeof(RangeSelector), new PropertyMetadata(DefaultStepFrequency));
 
-        private readonly DispatcherTimer keyDebounceTimer = new DispatcherTimer();
+        private readonly DispatcherQueueTimer keyDebounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
 
         private Border _outOfRangeContentContainer;
         private Rectangle _activeRectangle;
diff --git a/Microsoft.Toolkit.Uwp.UI/Extensions/DispatcherTimerExtensions.cs b/Microsoft.Toolkit.Uwp.UI/Extensions/DispatcherQueueTimerExtensions.cs
similarity index 85%
rename from Microsoft.Toolkit.Uwp.UI/Extensions/DispatcherTimerExtensions.cs
rename to Microsoft.Toolkit.Uwp.UI/Extensions/DispatcherQueueTimerExtensions.cs
index d1ecfed07ed..dd31f93fd2b 100644
--- a/Microsoft.Toolkit.Uwp.UI/Extensions/DispatcherTimerExtensions.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Extensions/DispatcherQueueTimerExtensions.cs
@@ -4,16 +4,16 @@
 
 using System;
 using System.Collections.Concurrent;
-using Windows.UI.Xaml;
+using Windows.System;
 
 namespace Microsoft.Toolkit.Uwp.UI.Extensions
 {
     /// <summary>
-    /// Set of extention methods for using <see cref="DispatcherTimer"/>.
+    /// Set of extention methods for using <see cref="DispatcherQueueTimer"/>.
     /// </summary>
-    public static class DispatcherTimerExtensions
+    public static class DispatcherQueueTimerExtensions
     {
-        private static ConcurrentDictionary<DispatcherTimer, Action> _debounceInstances = new ConcurrentDictionary<DispatcherTimer, Action>();
+        private static ConcurrentDictionary<DispatcherQueueTimer, Action> _debounceInstances = new ConcurrentDictionary<DispatcherQueueTimer, Action>();
 
         /// <summary>
         /// <para>Used to debounce (rate-limit) an event.  The action will be postponed and executed after the interval has elapsed.  At the end of the interval, the function will be called with the arguments that were passed most recently to the debounced function.</para>
@@ -27,7 +27,7 @@ public static class DispatcherTimerExtensions
         /// <param name="immediate">Determines if the action execute on the leading edge instead of trailing edge.</param>
         /// <example>
         /// <code>
-        /// private DispatcherTimer _typeTimer = new DispatcherTimer();
+        /// private DispatcherQueueTimer _typeTimer = new DispatcherQueueTimer();
         ///
         /// _typeTimer.Debounce(async () =>
         ///     {
@@ -35,10 +35,10 @@ public static class DispatcherTimerExtensions
         ///     }, TimeSpan.FromSeconds(0.3));
         /// </code>
         /// </example>
-        public static void Debounce(this DispatcherTimer timer, Action action, TimeSpan interval, bool immediate = false)
+        public static void Debounce(this DispatcherQueueTimer timer, Action action, TimeSpan interval, bool immediate = false)
         {
             // Check and stop any existing timer
-            var timeout = timer.IsEnabled;
+            var timeout = timer.IsRunning;
             if (timeout)
             {
                 timer.Stop();
@@ -72,7 +72,7 @@ public static void Debounce(this DispatcherTimer timer, Action action, TimeSpan
         private static void Timer_Tick(object sender, object e)
         {
             // This event is only registered/run if we weren't in immediate mode above
-            if (sender is DispatcherTimer timer)
+            if (sender is DispatcherQueueTimer timer)
             {
                 timer.Tick -= Timer_Tick;
                 timer.Stop();