Skip to content

Commit 09bd343

Browse files
RosuavioRosuavio
committed
Move prop changed handlers to prop file
1 parent 4112efc commit 09bd343

File tree

2 files changed

+150
-150
lines changed

2 files changed

+150
-150
lines changed

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

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,155 @@ public double StepFrequency
121121
get => (double)GetValue(StepFrequencyProperty);
122122
set => SetValue(StepFrequencyProperty, value);
123123
}
124+
125+
private static void MinimumChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
126+
{
127+
var rangeSelector = d as RangeSelector;
128+
129+
if (rangeSelector == null || !rangeSelector._valuesAssigned)
130+
{
131+
return;
132+
}
133+
134+
var newValue = (double)e.NewValue;
135+
var oldValue = (double)e.OldValue;
136+
137+
if (rangeSelector.Maximum < newValue)
138+
{
139+
rangeSelector.Maximum = newValue + Epsilon;
140+
}
141+
142+
if (rangeSelector.RangeMin < newValue)
143+
{
144+
rangeSelector.RangeMin = newValue;
145+
}
146+
147+
if (rangeSelector.RangeMax < newValue)
148+
{
149+
rangeSelector.RangeMax = newValue;
150+
}
151+
152+
if (newValue != oldValue)
153+
{
154+
rangeSelector.SyncThumbs();
155+
}
156+
}
157+
158+
private static void MaximumChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
159+
{
160+
var rangeSelector = d as RangeSelector;
161+
162+
if (rangeSelector == null || !rangeSelector._valuesAssigned)
163+
{
164+
return;
165+
}
166+
167+
var newValue = (double)e.NewValue;
168+
var oldValue = (double)e.OldValue;
169+
170+
if (rangeSelector.Minimum > newValue)
171+
{
172+
rangeSelector.Minimum = newValue - Epsilon;
173+
}
174+
175+
if (rangeSelector.RangeMax > newValue)
176+
{
177+
rangeSelector.RangeMax = newValue;
178+
}
179+
180+
if (rangeSelector.RangeMin > newValue)
181+
{
182+
rangeSelector.RangeMin = newValue;
183+
}
184+
185+
if (newValue != oldValue)
186+
{
187+
rangeSelector.SyncThumbs();
188+
}
189+
}
190+
191+
private static void RangeMinChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
192+
{
193+
var rangeSelector = d as RangeSelector;
194+
195+
if (rangeSelector == null)
196+
{
197+
return;
198+
}
199+
200+
rangeSelector._minSet = true;
201+
202+
if (!rangeSelector._valuesAssigned)
203+
{
204+
return;
205+
}
206+
207+
var newValue = (double)e.NewValue;
208+
rangeSelector.RangeMinToStepFrequency();
209+
210+
if (rangeSelector._valuesAssigned)
211+
{
212+
if (newValue < rangeSelector.Minimum)
213+
{
214+
rangeSelector.RangeMin = rangeSelector.Minimum;
215+
}
216+
else if (newValue > rangeSelector.Maximum)
217+
{
218+
rangeSelector.RangeMin = rangeSelector.Maximum;
219+
}
220+
221+
rangeSelector.SyncActiveRectangle();
222+
223+
// If the new value is greater than the old max, move the max also
224+
if (newValue > rangeSelector.RangeMax)
225+
{
226+
rangeSelector.RangeMax = newValue;
227+
}
228+
}
229+
230+
rangeSelector.SyncThumbs();
231+
}
232+
233+
private static void RangeMaxChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
234+
{
235+
var rangeSelector = d as RangeSelector;
236+
237+
if (rangeSelector == null)
238+
{
239+
return;
240+
}
241+
242+
rangeSelector._maxSet = true;
243+
244+
if (!rangeSelector._valuesAssigned)
245+
{
246+
return;
247+
}
248+
249+
var newValue = (double)e.NewValue;
250+
rangeSelector.RangeMaxToStepFrequency();
251+
252+
if (rangeSelector._valuesAssigned)
253+
{
254+
if (newValue < rangeSelector.Minimum)
255+
{
256+
rangeSelector.RangeMax = rangeSelector.Minimum;
257+
}
258+
else if (newValue > rangeSelector.Maximum)
259+
{
260+
rangeSelector.RangeMax = rangeSelector.Maximum;
261+
}
262+
263+
rangeSelector.SyncActiveRectangle();
264+
265+
// If the new max is less than the old minimum then move the minimum
266+
if (newValue < rangeSelector.RangeMin)
267+
{
268+
rangeSelector.RangeMin = newValue;
269+
}
270+
}
271+
272+
rangeSelector.SyncThumbs();
273+
}
124274
}
125275
}

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

Lines changed: 0 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -198,156 +198,6 @@ private void VerifyValues()
198198
}
199199
}
200200

201-
private static void MinimumChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
202-
{
203-
var rangeSelector = d as RangeSelector;
204-
205-
if (rangeSelector == null || !rangeSelector._valuesAssigned)
206-
{
207-
return;
208-
}
209-
210-
var newValue = (double)e.NewValue;
211-
var oldValue = (double)e.OldValue;
212-
213-
if (rangeSelector.Maximum < newValue)
214-
{
215-
rangeSelector.Maximum = newValue + Epsilon;
216-
}
217-
218-
if (rangeSelector.RangeMin < newValue)
219-
{
220-
rangeSelector.RangeMin = newValue;
221-
}
222-
223-
if (rangeSelector.RangeMax < newValue)
224-
{
225-
rangeSelector.RangeMax = newValue;
226-
}
227-
228-
if (newValue != oldValue)
229-
{
230-
rangeSelector.SyncThumbs();
231-
}
232-
}
233-
234-
private static void MaximumChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
235-
{
236-
var rangeSelector = d as RangeSelector;
237-
238-
if (rangeSelector == null || !rangeSelector._valuesAssigned)
239-
{
240-
return;
241-
}
242-
243-
var newValue = (double)e.NewValue;
244-
var oldValue = (double)e.OldValue;
245-
246-
if (rangeSelector.Minimum > newValue)
247-
{
248-
rangeSelector.Minimum = newValue - Epsilon;
249-
}
250-
251-
if (rangeSelector.RangeMax > newValue)
252-
{
253-
rangeSelector.RangeMax = newValue;
254-
}
255-
256-
if (rangeSelector.RangeMin > newValue)
257-
{
258-
rangeSelector.RangeMin = newValue;
259-
}
260-
261-
if (newValue != oldValue)
262-
{
263-
rangeSelector.SyncThumbs();
264-
}
265-
}
266-
267-
private static void RangeMinChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
268-
{
269-
var rangeSelector = d as RangeSelector;
270-
271-
if (rangeSelector == null)
272-
{
273-
return;
274-
}
275-
276-
rangeSelector._minSet = true;
277-
278-
if (!rangeSelector._valuesAssigned)
279-
{
280-
return;
281-
}
282-
283-
var newValue = (double)e.NewValue;
284-
rangeSelector.RangeMinToStepFrequency();
285-
286-
if (rangeSelector._valuesAssigned)
287-
{
288-
if (newValue < rangeSelector.Minimum)
289-
{
290-
rangeSelector.RangeMin = rangeSelector.Minimum;
291-
}
292-
else if (newValue > rangeSelector.Maximum)
293-
{
294-
rangeSelector.RangeMin = rangeSelector.Maximum;
295-
}
296-
297-
rangeSelector.SyncActiveRectangle();
298-
299-
// If the new value is greater than the old max, move the max also
300-
if (newValue > rangeSelector.RangeMax)
301-
{
302-
rangeSelector.RangeMax = newValue;
303-
}
304-
}
305-
306-
rangeSelector.SyncThumbs();
307-
}
308-
309-
private static void RangeMaxChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
310-
{
311-
var rangeSelector = d as RangeSelector;
312-
313-
if (rangeSelector == null)
314-
{
315-
return;
316-
}
317-
318-
rangeSelector._maxSet = true;
319-
320-
if (!rangeSelector._valuesAssigned)
321-
{
322-
return;
323-
}
324-
325-
var newValue = (double)e.NewValue;
326-
rangeSelector.RangeMaxToStepFrequency();
327-
328-
if (rangeSelector._valuesAssigned)
329-
{
330-
if (newValue < rangeSelector.Minimum)
331-
{
332-
rangeSelector.RangeMax = rangeSelector.Minimum;
333-
}
334-
else if (newValue > rangeSelector.Maximum)
335-
{
336-
rangeSelector.RangeMax = rangeSelector.Maximum;
337-
}
338-
339-
rangeSelector.SyncActiveRectangle();
340-
341-
// If the new max is less than the old minimum then move the minimum
342-
if (newValue < rangeSelector.RangeMin)
343-
{
344-
rangeSelector.RangeMin = newValue;
345-
}
346-
}
347-
348-
rangeSelector.SyncThumbs();
349-
}
350-
351201
private static void UpdateToolTipText(RangeSelector rangeSelector, TextBlock toolTip, double newValue)
352202
{
353203
if (toolTip != null)

0 commit comments

Comments
 (0)