Skip to content

Range Selector refactor. #3925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Rosuavio wants to merge 2 commits into from
Closed

Range Selector refactor. #3925

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb4c8f
WIP
Rosuavio Apr 6, 2021
62e59e2
WIP
Rosuavio Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 69 additions & 66 deletions Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.Properties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// 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.UI.Xaml;
using Windows.UI.Xaml.Controls;

Expand Down Expand Up @@ -132,27 +133,30 @@ private static void MinimumChangedCallback(DependencyObject d, DependencyPropert
}

var newValue = (double)e.NewValue;
var oldValue = (double)e.OldValue;

if (rangeSelector.Maximum < newValue)
if (newValue > rangeSelector.Maximum)
{
rangeSelector.Maximum = newValue + Epsilon;
rangeSelector.Maximum = newValue;
rangeSelector.RangeStart = newValue;
rangeSelector.RangeEnd = newValue;
}

if (rangeSelector.RangeStart < newValue)
else if (newValue > rangeSelector.RangeStart)
{
rangeSelector.RangeStart = newValue;
}

if (rangeSelector.RangeEnd < newValue)
{
rangeSelector.RangeEnd = newValue;
if (newValue > rangeSelector.RangeEnd)
{
rangeSelector.RangeEnd = newValue;
}
}

if (newValue != oldValue)
else
{
rangeSelector.SyncThumbs();
rangeSelector.RangeStart = newValue + SteppedDistanceFromBound(rangeSelector.StepFrequency, rangeSelector.RangeStart - newValue);
}

rangeSelector.Minimum = newValue;

rangeSelector.SyncThumbs();
}

private static void MaximumChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
Expand All @@ -165,110 +169,109 @@ private static void MaximumChangedCallback(DependencyObject d, DependencyPropert
}

var newValue = (double)e.NewValue;
var oldValue = (double)e.OldValue;

if (rangeSelector.Minimum > newValue)
if (newValue < rangeSelector.Minimum)
{
rangeSelector.Minimum = newValue - Epsilon;
rangeSelector.Minimum = newValue;
rangeSelector.RangeStart = newValue;
rangeSelector.RangeEnd = newValue;
}

if (rangeSelector.RangeEnd > newValue)
else if (newValue < rangeSelector.RangeEnd)
{
rangeSelector.RangeEnd = newValue;
}

if (rangeSelector.RangeStart > newValue)
{
rangeSelector.RangeStart = newValue;
if (newValue < rangeSelector.RangeStart)
{
rangeSelector.RangeStart = newValue;
}
}

if (newValue != oldValue)
else
{
rangeSelector.SyncThumbs();
rangeSelector.RangeEnd = newValue - SteppedDistanceFromBound(rangeSelector.StepFrequency, newValue - rangeSelector.RangeEnd);
}

rangeSelector.Maximum = newValue;

rangeSelector.SyncThumbs();
}

private static double SteppedDistanceFromBound(double stepSize, double distanceFromBound)
{
var smallerStep = Math.Floor(distanceFromBound / stepSize) * stepSize;
var biggerStep = Math.Ceiling(distanceFromBound / stepSize) * stepSize;
var distanceToSmallerStep = distanceFromBound - smallerStep;
var distanceToBiggerStep = biggerStep - distanceFromBound;

return distanceToSmallerStep <= distanceToBiggerStep ? smallerStep : biggerStep;
}

private static void RangeMinChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var rangeSelector = d as RangeSelector;

if (rangeSelector == null)
if (rangeSelector == null || !rangeSelector._valuesAssigned)
{
return;
}

rangeSelector._minSet = true;
var newValue = (double)e.NewValue;

if (!rangeSelector._valuesAssigned)
if (newValue < rangeSelector.Minimum)
{
return;
rangeSelector.RangeStart = rangeSelector.Minimum;
}

var newValue = (double)e.NewValue;
rangeSelector.RangeMinToStepFrequency();

if (rangeSelector._valuesAssigned)
else
{
if (newValue < rangeSelector.Minimum)
var steppedNewValue = rangeSelector.Minimum + SteppedDistanceFromBound(rangeSelector.StepFrequency, newValue - rangeSelector.Minimum);

if (steppedNewValue > rangeSelector.RangeEnd)
{
rangeSelector.RangeStart = rangeSelector.Minimum;
var steppedMax = rangeSelector.Minimum + SteppedDistanceFromBound(rangeSelector.StepFrequency, rangeSelector.RangeEnd - rangeSelector.Minimum);
rangeSelector.RangeStart = steppedMax > rangeSelector.RangeEnd ? steppedMax - rangeSelector.StepFrequency : steppedMax;
}
else if (newValue > rangeSelector.Maximum)
else
{
rangeSelector.RangeStart = rangeSelector.Maximum;
}

rangeSelector.SyncActiveRectangle();

// If the new value is greater than the old max, move the max also
if (newValue > rangeSelector.RangeEnd)
{
rangeSelector.RangeEnd = newValue;
rangeSelector.RangeStart = steppedNewValue;
}
}

rangeSelector.SyncActiveRectangle();

rangeSelector.SyncThumbs();
}

private static void RangeMaxChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var rangeSelector = d as RangeSelector;

if (rangeSelector == null)
if (rangeSelector == null || !rangeSelector._valuesAssigned)
{
return;
}

rangeSelector._maxSet = true;
var newValue = (double)e.NewValue;

if (!rangeSelector._valuesAssigned)
if (newValue > rangeSelector.Maximum)
{
return;
rangeSelector.RangeEnd = rangeSelector.Maximum;
}

var newValue = (double)e.NewValue;
rangeSelector.RangeMaxToStepFrequency();

if (rangeSelector._valuesAssigned)
else
{
if (newValue < rangeSelector.Minimum)
{
rangeSelector.RangeEnd = rangeSelector.Minimum;
}
else if (newValue > rangeSelector.Maximum)
var steppedNewValue = rangeSelector.Maximum - SteppedDistanceFromBound(rangeSelector.StepFrequency, rangeSelector.Maximum - newValue);

if (steppedNewValue < rangeSelector.RangeStart)
{
rangeSelector.RangeEnd = rangeSelector.Maximum;
var steppedMin = rangeSelector.Maximum - SteppedDistanceFromBound(rangeSelector.StepFrequency, rangeSelector.Maximum - rangeSelector.RangeStart);
rangeSelector.RangeEnd = steppedMin < rangeSelector.RangeStart ? steppedMin + rangeSelector.StepFrequency : steppedMin;
}

rangeSelector.SyncActiveRectangle();

// If the new max is less than the old minimum then move the minimum
if (newValue < rangeSelector.RangeStart)
else
{
rangeSelector.RangeStart = newValue;
rangeSelector.RangeEnd = steppedNewValue;
}
}

rangeSelector.SyncActiveRectangle();

rangeSelector.SyncThumbs();
}
}
Expand Down