Skip to content

Commit

Permalink
(MahAppsGH-3746) Remove TimePickerBaseSelectionChangedEventArgs and u…
Browse files Browse the repository at this point in the history
…se RoutedPropertyChangedEventHandler and RoutedPropertyChangedEventArgs
  • Loading branch information
punker76 committed May 3, 2020
1 parent 8167598 commit 0453652
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 24 deletions.
15 changes: 8 additions & 7 deletions src/MahApps.Metro/Controls/TimePicker/TimePickerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ protected virtual void FocusElementAfterIsDropDownOpenChanged()
new PropertyMetadata(TimePartVisibility.All, OnPickerVisibilityChanged));

public static readonly RoutedEvent SelectedDateTimeChangedEvent = EventManager.RegisterRoutedEvent(
"SelectedDateTimeChanged",
RoutingStrategy.Direct,
typeof(EventHandler<TimePickerBaseSelectionChangedEventArgs<DateTime?>>),
"SelectedDateTimeChanged",
RoutingStrategy.Bubble,
typeof(RoutedPropertyChangedEventHandler<DateTime?>),
typeof(TimePickerBase));

public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
Expand Down Expand Up @@ -251,7 +251,7 @@ protected TimePickerBase()
/// <summary>
/// Occurs when the <see cref="SelectedDateTime" /> property is changed.
/// </summary>
public event EventHandler<TimePickerBaseSelectionChangedEventArgs<DateTime?>> SelectedDateTimeChanged
public event RoutedPropertyChangedEventHandler<DateTime?> SelectedDateTimeChanged
{
add { AddHandler(SelectedDateTimeChangedEvent, value); }
remove { RemoveHandler(SelectedDateTimeChangedEvent, value); }
Expand Down Expand Up @@ -530,9 +530,10 @@ protected virtual string GetValueForTextBox()

protected abstract void ClockSelectedTimeChanged(object sender, SelectionChangedEventArgs e);

protected virtual void OnSelectedTimeChanged(TimePickerBaseSelectionChangedEventArgs<DateTime?> e)
protected void RaiseSelectedDateTimeChangedEvent(DateTime? oldValue, DateTime? newValue)
{
RaiseEvent(e);
var args = new RoutedPropertyChangedEventArgs<DateTime?>(oldValue, newValue) { RoutedEvent = SelectedDateTimeChangedEvent };
this.RaiseEvent(args);
}

private static void OnSelectedTimeFormatChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
Expand Down Expand Up @@ -824,7 +825,7 @@ private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyProp

timePartPickerBase.SetHourPartValues((e.NewValue as DateTime?).GetValueOrDefault().TimeOfDay);

timePartPickerBase.OnSelectedTimeChanged(new TimePickerBaseSelectionChangedEventArgs<DateTime?>(SelectedDateTimeChangedEvent, (DateTime?)e.OldValue, (DateTime?)e.NewValue));
timePartPickerBase.RaiseSelectedDateTimeChangedEvent(e.OldValue as DateTime?, e.NewValue as DateTime?);

timePartPickerBase.WriteValueToTextBox();
}
Expand Down

This file was deleted.

0 comments on commit 0453652

Please sign in to comment.