Skip to content

Commit 1449e99

Browse files
committed
Update DateRangePicker.cs
1 parent 065cab2 commit 1449e99

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/WPFDevelopers.Shared/Controls/DateRangePicker/DateRangePicker.cs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ private void OnEndCalendar_PreviewMouseUp(object sender, MouseButtonEventArgs e)
238238
var calendar = sender as Calendar;
239239
if (e.OriginalSource is FrameworkElement fe)
240240
{
241-
var dayButton = FindParent<CalendarDayButton>(fe);
241+
var dayButton = ControlsHelper.FindParent<CalendarDayButton>(fe);
242242
if (dayButton != null && dayButton.DataContext is DateTime clickedDate)
243243
if (!calendar.SelectedDates.Contains(clickedDate))
244244
{
@@ -266,7 +266,7 @@ private void OnStartCalendar_PreviewMouseUp(object sender, MouseButtonEventArgs
266266
var calendar = sender as Calendar;
267267
if (e.OriginalSource is FrameworkElement fe)
268268
{
269-
var dayButton = FindParent<CalendarDayButton>(fe);
269+
var dayButton = ControlsHelper.FindParent<CalendarDayButton>(fe);
270270
if (dayButton != null && dayButton.DataContext is DateTime clickedDate)
271271
if (!calendar.SelectedDates.Contains(clickedDate))
272272
{
@@ -284,17 +284,6 @@ private void OnStartCalendar_PreviewMouseUp(object sender, MouseButtonEventArgs
284284
}
285285
}
286286

287-
private T FindParent<T>(DependencyObject child) where T : DependencyObject
288-
{
289-
var parent = VisualTreeHelper.GetParent(child);
290-
if (parent == null) return null;
291-
292-
if (parent is T tParent)
293-
return tParent;
294-
295-
return FindParent<T>(parent);
296-
}
297-
298287
private void OnBorder_PreviewMouseUp(object sender, MouseButtonEventArgs e)
299288
{
300289
if (e.OriginalSource is Button button)

0 commit comments

Comments
 (0)