Skip to content

Commit e652e27

Browse files
authored
Merge pull request #690 from Keboo/fix689
Allow 12:00am as initial time selection
2 parents f2b2130 + 3e37f12 commit e652e27

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

MaterialDesignThemes.Wpf/TimePicker.cs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -418,11 +418,17 @@ private void InitializeClock()
418418
_clockHostContentControl.SetBinding(StyleProperty, GetBinding(ClockHostContentControlStyleProperty));
419419
}
420420

421-
private void ClockChoiceMadeHandler(object sender, ClockChoiceMadeEventArgs clockChoiceMadeEventArgs)
422-
{
423-
if (clockChoiceMadeEventArgs.Mode == ClockDisplayMode.Minutes)
424-
TogglePopup();
425-
}
421+
private void ClockChoiceMadeHandler(object sender, ClockChoiceMadeEventArgs clockChoiceMadeEventArgs)
422+
{
423+
if (clockChoiceMadeEventArgs.Mode == ClockDisplayMode.Minutes)
424+
{
425+
TogglePopup();
426+
if (SelectedTime == null)
427+
{
428+
SelectedTime = _clock.Time;
429+
}
430+
}
431+
}
426432

427433
private void DropDownButtonOnClick(object sender, RoutedEventArgs routedEventArgs)
428434
{

0 commit comments

Comments
 (0)