RangeSelector: Split out Events file

Author: Rosuavio

Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.Events.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.Foundation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Shapes;
+
+namespace Microsoft.Toolkit.Uwp.UI.Controls
+{
+    /// <summary>
+    /// RangeSelector is a "double slider" control for range values.
+    /// </summary>
+    public partial class RangeSelector : Control
+    {
+        /// <summary>
+        /// Event raised when lower or upper range values are changed.
+        /// </summary>
+        public event EventHandler<RangeChangedEventArgs> ValueChanged;
+
+        /// <summary>
+        /// Event raised when lower or upper range thumbs start being dragged.
+        /// </summary>
+        public event DragStartedEventHandler ThumbDragStarted;
+
+        /// <summary>
+        /// Event raised when lower or upper range thumbs end being dragged.
+        /// </summary>
+        public event DragCompletedEventHandler ThumbDragCompleted;
+
+        private void OnValueChanged(RangeChangedEventArgs e)
+        {
+            ValueChanged?.Invoke(this, e);
+        }
+
+        private void OnThumbDragStarted(DragStartedEventArgs e)
+        {
+            ThumbDragStarted?.Invoke(this, e);
+        }
+
+        private void OnThumbDragCompleted(DragCompletedEventArgs e)
+        {
+            ThumbDragCompleted?.Invoke(this, e);
+        }
+    }
+}

Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs

@@ -55,21 +55,6 @@ public partial class RangeSelector : Control
         private Grid _toolTip;
         private TextBlock _toolTipText;
 
-        /// <summary>
-        /// Event raised when lower or upper range values are changed.
-        /// </summary>
-        public event EventHandler<RangeChangedEventArgs> ValueChanged;
-
-        /// <summary>
-        /// Event raised when lower or upper range thumbs start being dragged.
-        /// </summary>
-        public event DragStartedEventHandler ThumbDragStarted;
-
-        /// <summary>
-        /// Event raised when lower or upper range thumbs end being dragged.
-        /// </summary>
-        public event DragCompletedEventHandler ThumbDragCompleted;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="RangeSelector"/> class.
         /// Create a default range selector control.
@@ -249,13 +234,13 @@ private void ContainerCanvas_PointerExited(object sender, PointerRoutedEventArgs
             {
                 _pointerManipulatingMin = false;
                 _containerCanvas.IsHitTestVisible = true;
-                ValueChanged?.Invoke(this, new RangeChangedEventArgs(RangeMin, normalizedPosition, RangeSelectorProperty.MinimumValue));
+                OnValueChanged(new RangeChangedEventArgs(RangeMin, normalizedPosition, RangeSelectorProperty.MinimumValue));
             }
             else if (_pointerManipulatingMax)
             {
                 _pointerManipulatingMax = false;
                 _containerCanvas.IsHitTestVisible = true;
-                ValueChanged?.Invoke(this, new RangeChangedEventArgs(RangeMax, normalizedPosition, RangeSelectorProperty.MaximumValue));
+                OnValueChanged(new RangeChangedEventArgs(RangeMax, normalizedPosition, RangeSelectorProperty.MaximumValue));
             }
 
             if (_toolTip != null)
@@ -275,13 +260,13 @@ private void ContainerCanvas_PointerReleased(object sender, PointerRoutedEventAr
             {
                 _pointerManipulatingMin = false;
                 _containerCanvas.IsHitTestVisible = true;
-                ValueChanged?.Invoke(this, new RangeChangedEventArgs(RangeMin, normalizedPosition, RangeSelectorProperty.MinimumValue));
+                OnValueChanged(new RangeChangedEventArgs(RangeMin, normalizedPosition, RangeSelectorProperty.MinimumValue));
             }
             else if (_pointerManipulatingMax)
             {
                 _pointerManipulatingMax = false;
                 _containerCanvas.IsHitTestVisible = true;
-                ValueChanged?.Invoke(this, new RangeChangedEventArgs(RangeMax, normalizedPosition, RangeSelectorProperty.MaximumValue));
+                OnValueChanged(new RangeChangedEventArgs(RangeMax, normalizedPosition, RangeSelectorProperty.MaximumValue));
             }
 
             SyncThumbs();
@@ -698,20 +683,20 @@ private void Thumb_DragStarted(Thumb thumb)
 
         private void MinThumb_DragStarted(object sender, DragStartedEventArgs e)
         {
-            ThumbDragStarted?.Invoke(this, e);
+            OnThumbDragStarted(e);
             Thumb_DragStarted(_minThumb);
         }
 
         private void MaxThumb_DragStarted(object sender, DragStartedEventArgs e)
         {
-            ThumbDragStarted?.Invoke(this, e);
+            OnThumbDragStarted(e);
             Thumb_DragStarted(_maxThumb);
         }
 
         private void Thumb_DragCompleted(object sender, DragCompletedEventArgs e)
         {
-            ThumbDragCompleted?.Invoke(this, e);
-            ValueChanged?.Invoke(this, sender.Equals(_minThumb) ? new RangeChangedEventArgs(_oldValue, RangeMin, RangeSelectorProperty.MinimumValue) : new RangeChangedEventArgs(_oldValue, RangeMax, RangeSelectorProperty.MaximumValue));
+            OnThumbDragCompleted(e);
+            OnValueChanged(sender.Equals(_minThumb) ? new RangeChangedEventArgs(_oldValue, RangeMin, RangeSelectorProperty.MinimumValue) : new RangeChangedEventArgs(_oldValue, RangeMax, RangeSelectorProperty.MaximumValue));
             SyncThumbs();
 
             if (_toolTip != null)