Skip to content

Commit df169df

Browse files
committed
Fallow the proper 'On___' pattern
1 parent 09bd343 commit df169df

File tree

2 files changed

+34
-22
lines changed

2 files changed

+34
-22
lines changed

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using System;
66
using Windows.UI.Xaml.Controls;
7+
using Windows.UI.Xaml.Controls.Primitives;
78

89
namespace Microsoft.Toolkit.Uwp.UI.Controls
910
{
@@ -12,12 +13,44 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
1213
/// </summary>
1314
public partial class RangeSelector : Control
1415
{
16+
/// <summary>
17+
/// Event raised when lower or upper range thumbs start being dragged.
18+
/// </summary>
19+
public event DragStartedEventHandler ThumbDragStarted;
20+
21+
/// <summary>
22+
/// Event raised when lower or upper range thumbs end being dragged.
23+
/// </summary>
24+
public event DragCompletedEventHandler ThumbDragCompleted;
25+
1526
/// <summary>
1627
/// Event raised when lower or upper range values are changed.
1728
/// </summary>
1829
public event EventHandler<RangeChangedEventArgs> ValueChanged;
1930

20-
private void OnValueChanged(RangeChangedEventArgs e)
31+
/// <summary>
32+
/// Called before the <see cref="ThumbDragStarted"/> event occurs.
33+
/// </summary>
34+
/// <param name="e">Event data for the event.</param>
35+
protected void OnThumbDragStarted(DragStartedEventArgs e)
36+
{
37+
ThumbDragStarted?.Invoke(this, e);
38+
}
39+
40+
/// <summary>
41+
/// Called before the <see cref="ThumbDragCompleted"/> event occurs.
42+
/// </summary>
43+
/// <param name="e">Event data for the event.</param>
44+
protected void OnThumbDragCompleted(DragCompletedEventArgs e)
45+
{
46+
ThumbDragCompleted?.Invoke(this, e);
47+
}
48+
49+
/// <summary>
50+
/// Called before the <see cref="ValueChanged"/> event occurs.
51+
/// </summary>
52+
/// <param name="e"><see cref="RangeChangedEventArgs"/> event data for the event.</param>
53+
protected void OnValueChanged(RangeChangedEventArgs e)
2154
{
2255
ValueChanged?.Invoke(this, e);
2356
}

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls
1515
/// </summary>
1616
public partial class RangeSelector : Control
1717
{
18-
/// <summary>
19-
/// Event raised when lower or upper range thumbs start being dragged.
20-
/// </summary>
21-
public event DragStartedEventHandler ThumbDragStarted;
22-
23-
/// <summary>
24-
/// Event raised when lower or upper range thumbs end being dragged.
25-
/// </summary>
26-
public event DragCompletedEventHandler ThumbDragCompleted;
27-
28-
private void OnThumbDragStarted(DragStartedEventArgs e)
29-
{
30-
ThumbDragStarted?.Invoke(this, e);
31-
}
32-
33-
private void OnThumbDragCompleted(DragCompletedEventArgs e)
34-
{
35-
ThumbDragCompleted?.Invoke(this, e);
36-
}
37-
3818
private void MinThumb_DragDelta(object sender, DragDeltaEventArgs e)
3919
{
4020
_absolutePosition += e.HorizontalChange;
@@ -90,7 +70,6 @@ private double DragWidth()
9070
return _containerCanvas.ActualWidth - _maxThumb.Width;
9171
}
9272

93-
9473
private double DragThumb(Thumb thumb, double min, double max, double nextPos)
9574
{
9675
nextPos = Math.Max(min, nextPos);

0 commit comments

Comments
 (0)